npm - @ibiz-template/runtime - Versions diffs - 0.7.29 → 0.7.30 - Mend

@ibiz-template/runtime 0.7.29 → 0.7.30

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.

Files changed (83) hide show

package/out/controller/control/data-view/data-view.controller.d.ts.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"data-view.controller.d.ts","sourceRoot":"","sources":["../../../../src/controller/control/data-view/data-view.controller.ts"],"names":[],"mappings":"AACA,OAAO,EACL,WAAW,EACX,eAAe,EACf,oBAAoB,EACrB,MAAM,kBAAkB,CAAC;AAE1B,OAAO,EACL,qBAAqB,EACrB,qBAAqB,EACrB,0BAA0B,EAC1B,gBAAgB,EAChB,oBAAoB,EACpB,YAAY,EAEb,MAAM,oBAAoB,CAAC;AAG5B,OAAO,EAAE,mBAAmB,EAAE,MAAM,cAAc,CAAC;AACnD,OAAO,EAAE,oBAAoB,EAAuB,MAAM,aAAa,CAAC;AACxE,OAAO,EAAE,sBAAsB,EAAE,MAAM,qBAAqB,CAAC;AAE7D,qBAAa,yBAAyB,CAClC,CAAC,SAAS,WAAW,GAAG,WAAW,EACnC,CAAC,SAAS,qBAAqB,GAAG,qBAAqB,EACvD,CAAC,SAAS,qBAAqB,GAAG,qBAAqB,CAEzD,SAAQ,mBAAmB,CAAC,CAAC,EAAE,CAAC,EAAE,CAAC,CACnC,YAAW,0BAA0B;IAErC;;;;;OAKG;IACK,OAAO,EAAE,sBAAsB,CAAC;IAExC;;;;;OAKG;IACH,kBAAkB,CAAC,EAAE,SAAS,YAAY,EAAE,CAAC;IAE7C;;;;;;OAMG;IACH,IAAI,SAAS,IAAI,OAAO,CAEvB;IAED;;;;;OAKG;IACH,SAAS,CAAC,SAAS,IAAI,IAAI;IAU3B;;;;;;OAMG;cACa,SAAS,IAAI,OAAO,CAAC,IAAI,CAAC;IAM1C;;;;;;OAMG;cACa,kBAAkB,IAAI,OAAO,CAAC,IAAI,CAAC;IAKnD;;;;;;OAMG;IACG,qBAAqB,IAAI,OAAO,CAAC,IAAI,CAAC;IA2B5C;;;;;;OAMG;IACG,UAAU,CAAC,IAAI,EAAE,KAAK,GAAG,OAAO,CAAC,IAAI,CAAC;IAyD5C;;;;;OAKG;IAEH,YAAY,CAAC,KAAK,EAAE,KAAK,GAAG,IAAI;IAyB1B,SAAS,CAAC,IAAI,EAAE,gBAAgB,EAAE,KAAK,EAAE,KAAK,EAAE,GAAG,OAAO,CAAC,KAAK,EAAE,CAAC;IAQzE;;;;;OAKG;IACH,eAAe,IAAI,eAAe,GAAG,IAAI;IAazC;;;;;;OAMG;IACH,gBAAgB,CAAC,IAAI,EAAE,KAAK,GAAG,oBAAoB;IAkCnD;;;;;;;;OAQG;IACG,aAAa,CACjB,MAAM,EAAE,oBAAoB,EAC5B,IAAI,EAAE,KAAK,EACX,KAAK,EAAE,UAAU,GAChB,OAAO,CAAC,IAAI,CAAC;IAehB;;;;OAIG;IACG,eAAe,IAAI,OAAO,CAAC,IAAI,CAAC;IAmBtC;;;;OAIG;~~IACH~~,eAAe,IAAI,IAAI;~~IA6BvB~~;;;;;;OAMG;cACa,sBAAsB,IAAI,OAAO,CAAC,IAAI,CAAC;IAavD;;;;OAIG;IACG,mBAAmB,IAAI,OAAO,CAAC,IAAI,CAAC;IAqC1C;;;;;OAKG;IACH,YAAY,IAAI;QACd,qBAAqB,EAAE,MAAM,GAAG,SAAS,CAAC;QAC1C,YAAY,EAAE,MAAM,GAAG,SAAS,CAAC;KAClC;IAOD;;;;;;OAMG;IACH,UAAU,CAAC,KAAK,EAAE,UAAU,EAAE,KAAK,EAAE,MAAM,GAAG,MAAM,GAAG,IAAI;IAe3D;;;;;;;OAOG;IACG,mBAAmB,CACvB,MAAM,EAAE,oBAAoB,EAC5B,KAAK,EAAE,UAAU,EACjB,KAAK,EAAE,oBAAoB,GAC1B,OAAO,CAAC,IAAI,CAAC;IAgBhB;;;;;OAKG;IACH,aAAa,IAAI,IAAI;CAuCtB"}
1	+ {"version":3,"file":"data-view.controller.d.ts","sourceRoot":"","sources":["../../../../src/controller/control/data-view/data-view.controller.ts"],"names":[],"mappings":"AACA,OAAO,EACL,WAAW,EACX,eAAe,EACf,oBAAoB,EACrB,MAAM,kBAAkB,CAAC;AAE1B,OAAO,EACL,qBAAqB,EACrB,qBAAqB,EACrB,0BAA0B,EAC1B,gBAAgB,EAChB,oBAAoB,EACpB,YAAY,EAEb,MAAM,oBAAoB,CAAC;AAG5B,OAAO,EAAE,mBAAmB,EAAE,MAAM,cAAc,CAAC;AACnD,OAAO,EAAE,oBAAoB,EAAuB,MAAM,aAAa,CAAC;AACxE,OAAO,EAAE,sBAAsB,EAAE,MAAM,qBAAqB,CAAC;AAE7D,qBAAa,yBAAyB,CAClC,CAAC,SAAS,WAAW,GAAG,WAAW,EACnC,CAAC,SAAS,qBAAqB,GAAG,qBAAqB,EACvD,CAAC,SAAS,qBAAqB,GAAG,qBAAqB,CAEzD,SAAQ,mBAAmB,CAAC,CAAC,EAAE,CAAC,EAAE,CAAC,CACnC,YAAW,0BAA0B;IAErC;;;;;OAKG;IACK,OAAO,EAAE,sBAAsB,CAAC;IAExC;;;;;OAKG;IACH,kBAAkB,CAAC,EAAE,SAAS,YAAY,EAAE,CAAC;IAE7C;;;;;;OAMG;IACH,IAAI,SAAS,IAAI,OAAO,CAEvB;IAED;;;;;OAKG;IACH,SAAS,CAAC,SAAS,IAAI,IAAI;IAU3B;;;;;;OAMG;cACa,SAAS,IAAI,OAAO,CAAC,IAAI,CAAC;IAM1C;;;;;;OAMG;cACa,kBAAkB,IAAI,OAAO,CAAC,IAAI,CAAC;IAKnD;;;;;;OAMG;IACG,qBAAqB,IAAI,OAAO,CAAC,IAAI,CAAC;IA2B5C;;;;;;OAMG;IACG,UAAU,CAAC,IAAI,EAAE,KAAK,GAAG,OAAO,CAAC,IAAI,CAAC;IAyD5C;;;;;OAKG;IAEH,YAAY,CAAC,KAAK,EAAE,KAAK,GAAG,IAAI;IAyB1B,SAAS,CAAC,IAAI,EAAE,gBAAgB,EAAE,KAAK,EAAE,KAAK,EAAE,GAAG,OAAO,CAAC,KAAK,EAAE,CAAC;IAQzE;;;;;OAKG;IACH,eAAe,IAAI,eAAe,GAAG,IAAI;IAazC;;;;;;OAMG;IACH,gBAAgB,CAAC,IAAI,EAAE,KAAK,GAAG,oBAAoB;IAkCnD;;;;;;;;OAQG;IACG,aAAa,CACjB,MAAM,EAAE,oBAAoB,EAC5B,IAAI,EAAE,KAAK,EACX,KAAK,EAAE,UAAU,GAChB,OAAO,CAAC,IAAI,CAAC;IAehB;;;;OAIG;IACG,eAAe,IAAI,OAAO,CAAC,IAAI,CAAC;IAmBtC;;;;OAIG;IACG,eAAe,IAAI,OAAO,CAAC,IAAI,CAAC;IAwCtC;;;;;;OAMG;cACa,sBAAsB,IAAI,OAAO,CAAC,IAAI,CAAC;IAavD;;;;OAIG;IACG,mBAAmB,IAAI,OAAO,CAAC,IAAI,CAAC;IAqC1C;;;;;OAKG;IACH,YAAY,IAAI;QACd,qBAAqB,EAAE,MAAM,GAAG,SAAS,CAAC;QAC1C,YAAY,EAAE,MAAM,GAAG,SAAS,CAAC;KAClC;IAOD;;;;;;OAMG;IACH,UAAU,CAAC,KAAK,EAAE,UAAU,EAAE,KAAK,EAAE,MAAM,GAAG,MAAM,GAAG,IAAI;IAe3D;;;;;;;OAOG;IACG,mBAAmB,CACvB,MAAM,EAAE,oBAAoB,EAC5B,KAAK,EAAE,UAAU,EACjB,KAAK,EAAE,oBAAoB,GAC1B,OAAO,CAAC,IAAI,CAAC;IAgBhB;;;;;OAKG;IACH,aAAa,IAAI,IAAI;CAuCtB"}

package/out/controller/control/data-view/data-view.controller.js CHANGED Viewed

@@ -247,7 +247,7 @@ export class DataViewControlController extends MDControlController {
                 throw new RuntimeModelError(this.model, ibiz.i18n.t('runtime.controller.control.dataView.propertiesNoConfigured'));
             }
             if (groupMode === 'AUTO') {
-                this.handleAutoGroup();
+                await this.handleAutoGroup();
             }
             else if (groupMode === 'CODELIST') {
                 await this.handleCodeListGroup();
@@ -259,8 +259,14 @@ export class DataViewControlController extends MDControlController {
      *
      * @memberof DataViewControlController
      */
-    handleAutoGroup() {
-        const { groupAppDEFieldId } = this.model;
+    async handleAutoGroup() {
+        const { groupAppDEFieldId, groupCodeListId } = this.model;
+        // 自动分组且存在代码表时，使用代码表做一次转换
+        let codeList = [];
+        if (groupCodeListId) {
+            const app = ibiz.hub.getApp(this.context.srfappid);
+            codeList = await app.codeList.get(groupCodeListId, this.context, this.params);
+        }
         if (groupAppDEFieldId) {
             const { items } = this.state;
             const groupMap = new Map();
@@ -277,8 +283,9 @@ export class DataViewControlController extends MDControlController {
             });
             const groups = [];
             groupMap.forEach((value, key) => {
+                const codeListItem = codeList.find(x => x.value === key);
                 groups.push({
-                    caption: key,
+                    caption: (codeListItem === null || codeListItem === void 0 ? void 0 : codeListItem.text) || key,
                     key,
                     children: [...value],
                 });

package/out/controller/control/grid/grid/grid-column.controller.d.ts CHANGED Viewed

@@ -119,6 +119,6 @@ export declare class GridColumnController<T extends IDEGridColumn = IDEGridColum
      * @author: zhujiamin
      * @Date: 2023-08-15 11:29:58
      */
-    getCustomHtml(row: GridRowState): string | undefined;
+    getCustomHtml(row: GridRowState): Promise<string | undefined>;
 }
 //# sourceMappingURL=grid-column.controller.d.ts.map

package/out/controller/control/grid/grid/grid-column.controller.d.ts.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"grid-column.controller.d.ts","sourceRoot":"","sources":["../../../../../src/controller/control/grid/grid/grid-column.controller.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,aAAa,EAAE,eAAe,EAAE,MAAM,kBAAkB,CAAC;AAElE,OAAO,EAAE,YAAY,EAAE,MAAM,kBAAkB,CAAC;AAChD,OAAO,EAAE,cAAc,EAAE,MAAM,mBAAmB,CAAC;AACnD,OAAO,EAAE,qBAAqB,EAAE,MAAM,uBAAuB,CAAC;AAE9D;;;;;GAKG;AACH,qBAAa,oBAAoB,CAAC,CAAC,SAAS,aAAa,GAAG,aAAa,CACvE,YAAW,qBAAqB;IAEhC;;;;;;OAMG;IACH,QAAQ,CAAC,KAAK,EAAE,CAAC,CAAC;IAElB;;;;;;OAMG;IACH,QAAQ,CAAC,IAAI,EAAE,cAAc,CAAC;IAE9B;;;;;OAKG;IACH,gBAAgB,EAAE,OAAO,CAAS;IAElC;;;;;OAKG;IACH,YAAY,EAAE,OAAO,CAAS;IAE9B;;;;;;;OAOG;IACH,IAAI,OAAO,IAAI,QAAQ,CAEtB;IAED;;;;;;;OAOG;IACH,IAAI,MAAM,IAAI,OAAO,CAEpB;IAED;;;;;;OAMG;IACH,IAAI,aAAa,IAAI,OAAO,CAE3B;IAED;;;;;OAKG;IACH,IAAI,cAAc,IAAI,eAAe,GAAG,SAAS,CAIhD;IAED;;;;;;OAMG;IACH,IAAI,WAAW,IAAI,MAAM,GAAG,SAAS,CAEpC;IAED;;;;;;OAMG;IACH,IAAI,QAAQ,IAAI,MAAM,GAAG,SAAS,CAEjC;IAED;;;;;OAKG;gBACS,KAAK,EAAE,CAAC,EAAE,IAAI,EAAE,cAAc;IAY1C;;;;;;OAMG;IACG,IAAI,IAAI,OAAO,CAAC,IAAI,CAAC;IAI3B;;;;;;;OAOG;cACa,MAAM,IAAI,OAAO,CAAC,IAAI,CAAC;IAIvC;;;;;;OAMG;~~IACH~~,aAAa,CAAC,GAAG,EAAE,YAAY,GAAG,MAAM,GAAG,SAAS;~~CASrD~~"}
1	+ {"version":3,"file":"grid-column.controller.d.ts","sourceRoot":"","sources":["../../../../../src/controller/control/grid/grid/grid-column.controller.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,aAAa,EAAE,eAAe,EAAE,MAAM,kBAAkB,CAAC;AAElE,OAAO,EAAE,YAAY,EAAE,MAAM,kBAAkB,CAAC;AAChD,OAAO,EAAE,cAAc,EAAE,MAAM,mBAAmB,CAAC;AACnD,OAAO,EAAE,qBAAqB,EAAE,MAAM,uBAAuB,CAAC;AAE9D;;;;;GAKG;AACH,qBAAa,oBAAoB,CAAC,CAAC,SAAS,aAAa,GAAG,aAAa,CACvE,YAAW,qBAAqB;IAEhC;;;;;;OAMG;IACH,QAAQ,CAAC,KAAK,EAAE,CAAC,CAAC;IAElB;;;;;;OAMG;IACH,QAAQ,CAAC,IAAI,EAAE,cAAc,CAAC;IAE9B;;;;;OAKG;IACH,gBAAgB,EAAE,OAAO,CAAS;IAElC;;;;;OAKG;IACH,YAAY,EAAE,OAAO,CAAS;IAE9B;;;;;;;OAOG;IACH,IAAI,OAAO,IAAI,QAAQ,CAEtB;IAED;;;;;;;OAOG;IACH,IAAI,MAAM,IAAI,OAAO,CAEpB;IAED;;;;;;OAMG;IACH,IAAI,aAAa,IAAI,OAAO,CAE3B;IAED;;;;;OAKG;IACH,IAAI,cAAc,IAAI,eAAe,GAAG,SAAS,CAIhD;IAED;;;;;;OAMG;IACH,IAAI,WAAW,IAAI,MAAM,GAAG,SAAS,CAEpC;IAED;;;;;;OAMG;IACH,IAAI,QAAQ,IAAI,MAAM,GAAG,SAAS,CAEjC;IAED;;;;;OAKG;gBACS,KAAK,EAAE,CAAC,EAAE,IAAI,EAAE,cAAc;IAY1C;;;;;;OAMG;IACG,IAAI,IAAI,OAAO,CAAC,IAAI,CAAC;IAI3B;;;;;;;OAOG;cACa,MAAM,IAAI,OAAO,CAAC,IAAI,CAAC;IAIvC;;;;;;OAMG;IACG,aAAa,CAAC,GAAG,EAAE,YAAY,GAAG,OAAO,CAAC,MAAM,GAAG,SAAS,CAAC;CAoBpE"}

package/out/controller/control/grid/grid/grid-column.controller.js CHANGED Viewed

@@ -132,10 +132,22 @@ export class GridColumnController {
      * @author: zhujiamin
      * @Date: 2023-08-15 11:29:58
      */
-    getCustomHtml(row) {
-        var _a;
+    async getCustomHtml(row) {
+        var _a, _b;
         if ((_a = this.deGridDataItem) === null || _a === void 0 ? void 0 : _a.scriptCode) {
-            return ScriptFactory.execScriptFn({ data: row.data }, this.deGridDataItem.scriptCode, { singleRowReturn: true, isAsync: false });
+            let scriptCode = (_b = this.deGridDataItem) === null || _b === void 0 ? void 0 : _b.scriptCode;
+            // 兼容单行脚本
+            if (!scriptCode.includes('return')) {
+                scriptCode = `return (${scriptCode})`;
+            }
+            return (await ScriptFactory.asyncExecScriptFn({
+                data: row.data,
+                context: this.context,
+                params: this.params,
+                controller: this,
+                ctrl: this.grid,
+                view: this.grid.view,
+            }, scriptCode));
         }
     }
 }

package/out/controller/control/grid/grid/grid.controller.d.ts CHANGED Viewed

@@ -58,12 +58,12 @@ export declare class GridController<T extends IDEGrid = IDEGrid, S extends IGrid
      */
     jsonSchemaParams: IParams;
     /**
-     * 是否显示百分比
+     * 显示百分比列
      *
-     * @type {boolean}
+     * @type {string[]}
      * @memberof GridController
      */
-    showPercent: boolean;
+    percentkeys: string[];
     /**
      * 所有表格列控制器集合
      *

package/out/controller/control/grid/grid/grid.controller.d.ts.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"grid.controller.d.ts","sourceRoot":"","sources":["../../../../../src/controller/control/grid/grid/grid.controller.ts"],"names":[],"mappings":"AAYA,OAAO,EACL,OAAO,EAEP,aAAa,EACb,aAAa,EACd,MAAM,kBAAkB,CAAC;AAG1B,OAAO,EAAE,yBAAyB,EAAE,MAAM,+DAA+D,CAAC;AAC1G,OAAO,EAAE,oBAAoB,EAAE,MAAM,0BAA0B,CAAC;AAChE,OAAO,EAAE,YAAY,EAAE,MAAM,kBAAkB,CAAC;AAChD,OAAO,EAAE,WAAW,EAAE,MAAM,gBAAgB,CAAC;AAC7C,OAAO,EACL,6BAA6B,EAC7B,sBAAsB,EACvB,MAAM,gBAAgB,CAAC;AACxB,OAAO,EACL,UAAU,EACV,UAAU,EACV,eAAe,EACf,mBAAmB,EACnB,YAAY,EACZ,gBAAgB,EAChB,aAAa,EACb,aAAa,EACb,YAAY,EACZ,gBAAgB,EAEjB,MAAM,uBAAuB,CAAC;AAG/B,OAAO,EAAE,SAAS,EAAS,MAAM,qBAAqB,CAAC;AACvD,OAAO,EAAE,mBAAmB,EAAE,MAAM,iBAAiB,CAAC;AACtD,OAAO,EAAE,eAAe,EAAE,MAAM,mBAAmB,CAAC;AACpD,OAAO,EACL,eAAe,EAKhB,MAAM,gBAAgB,CAAC;AAQxB;;;;;;;;GAQG;AACH,qBAAa,cAAc,CACvB,CAAC,SAAS,OAAO,GAAG,OAAO,EAC3B,CAAC,SAAS,UAAU,GAAG,UAAU,EACjC,CAAC,SAAS,UAAU,GAAG,UAAU,CAEnC,SAAQ,mBAAmB,CAAC,CAAC,EAAE,CAAC,EAAE,CAAC,CACnC,YAAW,eAAe,CAAC,CAAC,EAAE,CAAC,EAAE,CAAC,CAAC;IAEnC;;;;;;OAMG;IACK,OAAO,EAAE,WAAW,CAAC;IAE7B,SAAS,KAAK,IAAI,IAAI,eAAe,CAAC,UAAU,CAAC,CAEhD;IAED;;;;;OAKG;IACH,iBAAiB,EAAE,OAAO,CAAS;IAEnC;;;;;OAKG;IACH,kBAAkB,EAAE,OAAO,CAAS;IAEpC;;;;;OAKG;IACH,eAAe,EAAE,OAAO,CAAS;IAEjC;;;;;;OAMG;IACH,gBAAgB,EAAE,OAAO,CAAM;IAE/B;;;;;OAKG;IACH,WAAW,EAAE,~~OAAO~~,~~CAAS~~;~~IAE7B~~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~~CAoBtB~~"}
1	+ {"version":3,"file":"grid.controller.d.ts","sourceRoot":"","sources":["../../../../../src/controller/control/grid/grid/grid.controller.ts"],"names":[],"mappings":"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"}

package/out/controller/control/grid/grid/grid.controller.js CHANGED Viewed

@@ -54,12 +54,12 @@ export class GridController extends MDControlController {
          */
         this.jsonSchemaParams = {};
         /**
-         * 是否显示百分比
+         * 显示百分比列
          *
-         * @type {boolean}
+         * @type {string[]}
          * @memberof GridController
          */
-        this.showPercent = false;
+        this.percentkeys = [];
         /**
          * 所有表格列控制器集合
          *
@@ -225,7 +225,7 @@ export class GridController extends MDControlController {
         this.addSchemaColumn = this.controlParams.enablejsonschema === 'true';
         const jsonSchemaParams = JSON.parse(this.controlParams.jsonschemaparams || '{}');
         this.jsonSchemaParams = convertNavData(jsonSchemaParams, this.params, this.context);
-        this.showPercent = this.controlParams.showpercent === 'true';
+        this.percentkeys = this.controlParams.percentkeys || [];
         await this.initByEntitySchema();
         await super.onCreated();
         this.service = new GridService(this.model);
@@ -1421,12 +1421,11 @@ export class GridController extends MDControlController {
      * @return {*}  {Promise<void>}
      */
     calcTotalData() {
-        if (!this.showPercent) {
+        if (this.percentkeys.length === 0) {
             return;
         }
         const totalResult = {};
-        Object.values(this.fieldColumns).forEach(column => {
-            const fieldName = column.model.id;
+        this.percentkeys.forEach(fieldName => {
             const result = this.state.items
                 .map(item => item[fieldName])
                 .reduce((a, b) => {

package/out/controller/control/list/list.controller.d.ts CHANGED Viewed

@@ -53,7 +53,7 @@ export declare class ListController extends MDControlController<IDEList, IListSt
      *
      * @memberof DataViewControlController
      */
-    protected handleAutoGroup(): void;
+    protected handleAutoGroup(): Promise<void>;
     /**
      * 处理代码表分组
      *

package/out/controller/control/list/list.controller.d.ts.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"list.controller.d.ts","sourceRoot":"","sources":["../../../../src/controller/control/list/list.controller.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,OAAO,EAAE,MAAM,kBAAkB,CAAC;AAC3C,OAAO,EACL,UAAU,EACV,UAAU,EACV,eAAe,EACf,gBAAgB,EAGjB,MAAM,oBAAoB,CAAC;AAC5B,OAAO,EAAE,mBAAmB,EAAE,MAAM,cAAc,CAAC;AACnD,OAAO,EAAE,WAAW,EAAE,MAAM,gBAAgB,CAAC;AAE7C,qBAAa,cACX,SAAQ,mBAAmB,CAAC,OAAO,EAAE,UAAU,EAAE,UAAU,CAC3D,YAAW,eAAe;IAElB,OAAO,EAAE,WAAW,CAAC;IAE7B,SAAS,CAAC,SAAS,IAAI,IAAI;cAOX,SAAS,IAAI,OAAO,CAAC,IAAI,CAAC;IAO1C;;;;;OAKG;IACH,YAAY,IAAI;QACd,qBAAqB,EAAE,MAAM,GAAG,SAAS,CAAC;QAC1C,YAAY,EAAE,MAAM,GAAG,SAAS,CAAC;KAClC;IAOD;;;;;OAKG;IACH,YAAY,CAAC,KAAK,EAAE,KAAK,GAAG,IAAI;IAyB1B,SAAS,CAAC,IAAI,EAAE,gBAAgB,EAAE,KAAK,EAAE,KAAK,EAAE,GAAG,OAAO,CAAC,KAAK,EAAE,CAAC;IAMzE;;;;;;;OAOG;IACH,OAAO,CAAC,KAAK,EAAE,KAAK,EAAE,GAAG,IAAI;IAI7B;;;;;;;OAOG;IACH,UAAU,IAAI,KAAK,EAAE;IAIrB;;;;OAIG;cACa,eAAe,IAAI,OAAO,CAAC,IAAI,CAAC;IAWhD;;;;OAIG;~~IACH~~,~~SAAS~~,CAAC,~~eAAe,~~IAAI,~~IAAI~~;~~IAsBjC~~;;;;OAIG;cACa,mBAAmB,IAAI,OAAO,CAAC,IAAI,CAAC;CAoCrD"}
1	+ {"version":3,"file":"list.controller.d.ts","sourceRoot":"","sources":["../../../../src/controller/control/list/list.controller.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,OAAO,EAAE,MAAM,kBAAkB,CAAC;AAC3C,OAAO,EACL,UAAU,EACV,UAAU,EACV,eAAe,EACf,gBAAgB,EAGjB,MAAM,oBAAoB,CAAC;AAC5B,OAAO,EAAE,mBAAmB,EAAE,MAAM,cAAc,CAAC;AACnD,OAAO,EAAE,WAAW,EAAE,MAAM,gBAAgB,CAAC;AAE7C,qBAAa,cACX,SAAQ,mBAAmB,CAAC,OAAO,EAAE,UAAU,EAAE,UAAU,CAC3D,YAAW,eAAe;IAElB,OAAO,EAAE,WAAW,CAAC;IAE7B,SAAS,CAAC,SAAS,IAAI,IAAI;cAOX,SAAS,IAAI,OAAO,CAAC,IAAI,CAAC;IAO1C;;;;;OAKG;IACH,YAAY,IAAI;QACd,qBAAqB,EAAE,MAAM,GAAG,SAAS,CAAC;QAC1C,YAAY,EAAE,MAAM,GAAG,SAAS,CAAC;KAClC;IAOD;;;;;OAKG;IACH,YAAY,CAAC,KAAK,EAAE,KAAK,GAAG,IAAI;IAyB1B,SAAS,CAAC,IAAI,EAAE,gBAAgB,EAAE,KAAK,EAAE,KAAK,EAAE,GAAG,OAAO,CAAC,KAAK,EAAE,CAAC;IAMzE;;;;;;;OAOG;IACH,OAAO,CAAC,KAAK,EAAE,KAAK,EAAE,GAAG,IAAI;IAI7B;;;;;;;OAOG;IACH,UAAU,IAAI,KAAK,EAAE;IAIrB;;;;OAIG;cACa,eAAe,IAAI,OAAO,CAAC,IAAI,CAAC;IAWhD;;;;OAIG;cACa,eAAe,IAAI,OAAO,CAAC,IAAI,CAAC;IAiChD;;;;OAIG;cACa,mBAAmB,IAAI,OAAO,CAAC,IAAI,CAAC;CAoCrD"}

package/out/controller/control/list/list.controller.js CHANGED Viewed

@@ -89,7 +89,7 @@ export class ListController extends MDControlController {
         const { enableGroup, groupMode } = this.model;
         if (enableGroup && groupMode) {
             if (groupMode === 'AUTO') {
-                this.handleAutoGroup();
+                await this.handleAutoGroup();
             }
             else if (groupMode === 'CODELIST') {
                 await this.handleCodeListGroup();
@@ -101,8 +101,14 @@ export class ListController extends MDControlController {
      *
      * @memberof DataViewControlController
      */
-    handleAutoGroup() {
-        const { groupAppDEFieldId } = this.model;
+    async handleAutoGroup() {
+        const { groupAppDEFieldId, groupCodeListId } = this.model;
+        // 自动分组且存在代码表时，使用代码表做一次转换
+        let codeList = [];
+        if (groupCodeListId) {
+            const app = ibiz.hub.getApp(this.context.srfappid);
+            codeList = await app.codeList.get(groupCodeListId, this.context, this.params);
+        }
         if (groupAppDEFieldId) {
             const { items } = this.state;
             const childrenMap = new Map();
@@ -113,8 +119,9 @@ export class ListController extends MDControlController {
             });
             const groups = [];
             childrenMap.forEach((value, key) => {
+                const codeListItem = codeList.find(x => x.value === key);
                 groups.push({
-                    caption: key,
+                    caption: (codeListItem === null || codeListItem === void 0 ? void 0 : codeListItem.text) || key,
                     key,
                     children: [...value],
                 });

package/out/controller/control/md-ctrl/md-ctrl.controller.d.ts CHANGED Viewed

@@ -84,7 +84,7 @@ export declare class MDCtrlController extends MDControlController<IDEMobMDCtrl,
      *
      * @memberof MDCtrlController
      */
-    protected handleAutoGroup(): void;
+    protected handleAutoGroup(): Promise<void>;
     /**
      * 加载并初始化分组代码表项集合
      * @author lxm

package/out/controller/control/md-ctrl/md-ctrl.controller.d.ts.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"md-ctrl.controller.d.ts","sourceRoot":"","sources":["../../../../src/controller/control/md-ctrl/md-ctrl.controller.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,YAAY,EACZ,cAAc,EACd,oBAAoB,EACrB,MAAM,kBAAkB,CAAC;AAG1B,OAAO,EACL,eAAe,EACf,oBAAoB,EACpB,eAAe,EACf,kBAAkB,EAClB,gBAAgB,EAEhB,YAAY,EACb,MAAM,oBAAoB,CAAC;AAC5B,OAAO,EAAE,aAAa,EAAE,MAAM,mBAAmB,CAAC;AAClD,OAAO,EAAE,iBAAiB,EAAE,MAAM,qBAAqB,CAAC;AACxD,OAAO,EAAE,mBAAmB,EAAE,MAAM,cAAc,CAAC;AACnD,OAAO,EAAE,SAAS,EAAE,MAAM,kBAAkB,CAAC;AAI7C,qBAAa,gBACX,SAAQ,mBAAmB,CAAC,YAAY,EAAE,eAAe,EAAE,eAAe,CAC1E,YAAW,oBAAoB;IAEvB,OAAO,EAAE,aAAa,CAAC;IAE/B,SAAS,CAAC,SAAS,IAAI,IAAI;IAQ3B;;;;;;;OAOG;IACH,kBAAkB,CAAC,EAAE,SAAS,YAAY,EAAE,CAAC;cAE7B,SAAS,IAAI,OAAO,CAAC,IAAI,CAAC;IAQ1C;;;;;OAKG;IACG,QAAQ,IAAI,OAAO,CAAC,IAAI,CAAC;IAO/B;;;;;;;OAOG;IACG,OAAO,IAAI,OAAO,CAAC,IAAI,CAAC;IAMxB,SAAS,CACb,IAAI,EAAE,gBAAgB,EACtB,KAAK,EAAE,SAAS,EAAE,GACjB,OAAO,CAAC,KAAK,EAAE,CAAC;IAkBnB;;;;;;;OAOG;IACH,OAAO,CAAC,KAAK,EAAE,KAAK,EAAE,GAAG,IAAI;IAQ7B;;;;;;;OAOG;IACH,UAAU,IAAI,KAAK,EAAE;IAIrB;;;;;;;;;OASG;IACG,aAAa,CACjB,MAAM,EAAE,oBAAoB,EAC5B,GAAG,EAAE,kBAAkB,EACvB,KAAK,EAAE,UAAU,GAChB,OAAO,CAAC,IAAI,CAAC;IAehB;;;;;;;OAOG;IACH,SAAS,CAAC,gBAAgB,CAAC,GAAG,EAAE,iBAAiB,GAAG,IAAI;IAUxD,SAAS,CAAC,iBAAiB,CACzB,GAAG,EAAE,iBAAiB,EACtB,KAAK,EAAE,cAAc,GACpB,IAAI;IAuBP;;;;OAIG;cACa,eAAe,IAAI,OAAO,CAAC,IAAI,CAAC;IAmBhD;;;;OAIG;~~IACH~~,~~SAAS~~,CAAC,~~eAAe,~~IAAI,~~IAAI~~;~~IA+BjC~~;;;;;;OAMG;cACa,sBAAsB,IAAI,OAAO,CAAC,IAAI,CAAC;IAavD;;;;OAIG;cACa,mBAAmB,IAAI,OAAO,CAAC,IAAI,CAAC;CAoCrD"}
1	+ {"version":3,"file":"md-ctrl.controller.d.ts","sourceRoot":"","sources":["../../../../src/controller/control/md-ctrl/md-ctrl.controller.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,YAAY,EACZ,cAAc,EACd,oBAAoB,EACrB,MAAM,kBAAkB,CAAC;AAG1B,OAAO,EACL,eAAe,EACf,oBAAoB,EACpB,eAAe,EACf,kBAAkB,EAClB,gBAAgB,EAEhB,YAAY,EACb,MAAM,oBAAoB,CAAC;AAC5B,OAAO,EAAE,aAAa,EAAE,MAAM,mBAAmB,CAAC;AAClD,OAAO,EAAE,iBAAiB,EAAE,MAAM,qBAAqB,CAAC;AACxD,OAAO,EAAE,mBAAmB,EAAE,MAAM,cAAc,CAAC;AACnD,OAAO,EAAE,SAAS,EAAE,MAAM,kBAAkB,CAAC;AAI7C,qBAAa,gBACX,SAAQ,mBAAmB,CAAC,YAAY,EAAE,eAAe,EAAE,eAAe,CAC1E,YAAW,oBAAoB;IAEvB,OAAO,EAAE,aAAa,CAAC;IAE/B,SAAS,CAAC,SAAS,IAAI,IAAI;IAQ3B;;;;;;;OAOG;IACH,kBAAkB,CAAC,EAAE,SAAS,YAAY,EAAE,CAAC;cAE7B,SAAS,IAAI,OAAO,CAAC,IAAI,CAAC;IAQ1C;;;;;OAKG;IACG,QAAQ,IAAI,OAAO,CAAC,IAAI,CAAC;IAO/B;;;;;;;OAOG;IACG,OAAO,IAAI,OAAO,CAAC,IAAI,CAAC;IAMxB,SAAS,CACb,IAAI,EAAE,gBAAgB,EACtB,KAAK,EAAE,SAAS,EAAE,GACjB,OAAO,CAAC,KAAK,EAAE,CAAC;IAkBnB;;;;;;;OAOG;IACH,OAAO,CAAC,KAAK,EAAE,KAAK,EAAE,GAAG,IAAI;IAQ7B;;;;;;;OAOG;IACH,UAAU,IAAI,KAAK,EAAE;IAIrB;;;;;;;;;OASG;IACG,aAAa,CACjB,MAAM,EAAE,oBAAoB,EAC5B,GAAG,EAAE,kBAAkB,EACvB,KAAK,EAAE,UAAU,GAChB,OAAO,CAAC,IAAI,CAAC;IAehB;;;;;;;OAOG;IACH,SAAS,CAAC,gBAAgB,CAAC,GAAG,EAAE,iBAAiB,GAAG,IAAI;IAUxD,SAAS,CAAC,iBAAiB,CACzB,GAAG,EAAE,iBAAiB,EACtB,KAAK,EAAE,cAAc,GACpB,IAAI;IAuBP;;;;OAIG;cACa,eAAe,IAAI,OAAO,CAAC,IAAI,CAAC;IAmBhD;;;;OAIG;cACa,eAAe,IAAI,OAAO,CAAC,IAAI,CAAC;IA0ChD;;;;;;OAMG;cACa,sBAAsB,IAAI,OAAO,CAAC,IAAI,CAAC;IAavD;;;;OAIG;cACa,mBAAmB,IAAI,OAAO,CAAC,IAAI,CAAC;CAoCrD"}

package/out/controller/control/md-ctrl/md-ctrl.controller.js CHANGED Viewed

@@ -152,7 +152,7 @@ export class MDCtrlController extends MDControlController {
                 throw new RuntimeModelError(this.model, ibiz.i18n.t('runtime.controller.control.dataView.propertiesNoConfigured'));
             }
             if (groupMode === 'AUTO') {
-                this.handleAutoGroup();
+                await this.handleAutoGroup();
             }
             else if (groupMode === 'CODELIST') {
                 await this.handleCodeListGroup();
@@ -164,8 +164,14 @@ export class MDCtrlController extends MDControlController {
      *
      * @memberof MDCtrlController
      */
-    handleAutoGroup() {
-        const { groupAppDEFieldId } = this.model;
+    async handleAutoGroup() {
+        const { groupAppDEFieldId, groupCodeListId } = this.model;
+        // 自动分组且存在代码表时，使用代码表做一次转换
+        let codeList = [];
+        if (groupCodeListId) {
+            const app = ibiz.hub.getApp(this.context.srfappid);
+            codeList = await app.codeList.get(groupCodeListId, this.context, this.params);
+        }
         if (groupAppDEFieldId) {
             const { items } = this.state;
             const groupMap = new Map();
@@ -184,8 +190,9 @@ export class MDCtrlController extends MDControlController {
             });
             const groups = [];
             groupMap.forEach((value, key) => {
+                const codeListItem = codeList.find(x => x.value === key);
                 groups.push({
-                    caption: key,
+                    caption: (codeListItem === null || codeListItem === void 0 ? void 0 : codeListItem.text) || key,
                     key,
                     children: [...value],
                 });

package/out/controller/control/search-bar/interface-util.d.ts.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"interface-util.d.ts","sourceRoot":"","sources":["../../../../src/controller/control/search-bar/interface-util.ts"],"names":[],"mappings":"AAEA,OAAO,EACL,WAAW,~~EAIX~~,WAAW,~~EACX~~,aAAa,~~EAOd~~,MAAM,oBAAoB,CAAC;AAK5B;;;;;GAKG;AACH,wBAAgB,oBAAoB,IAAI,WAAW,EAAE,CAUpD;AAED;;;;;;;;;GASG;AACH,wBAAgB,mBAAmB,CAAC,WAAW,EAAE,WAAW,EAAE,GAAG;IAC/D,IAAI,EAAE,OAAO,CAAC;CACf,~~CAgCA~~;AAID,eAAe;AACf,MAAM,MAAM,aAAa,GAAG,CAC1B,UAAU,EAAE,WAAW,EACvB,UAAU,EAAE,WAAW,KACpB,IAAI,CAAC;AAEV;;;;;;;GAOG;AACH,wBAAgB,qBAAqB,CACnC,UAAU,EAAE,WAAW,EACvB,IAAI,CAAC,EAAE;IAAE,KAAK,EAAE,aAAa,CAAA;CAAE,GAC9B,WAAW,~~CAuDb~~;AAED;;;;;;;;GAQG;AACH,wBAAgB,eAAe,CAC7B,WAAW,EAAE,WAAW,EAAE,EAC1B,IAAI,CAAC,EAAE;IAAE,KAAK,EAAE,aAAa,CAAA;CAAE,GAC9B,WAAW,EAAE,GAAG,SAAS,CAO3B;AAID;;;;;;;GAOG;AACH,wBAAgB,uBAAuB,CAAC,IAAI,EAAE,aAAa,GAAG,WAAW,~~CA8DxE~~;AAED;;;;;;;GAOG;AACH,wBAAgB,uBAAuB,CACrC,UAAU,EAAE,WAAW,GACtB,aAAa,~~CA0Df~~;AAED;;;;;;;;GAQG;AACH,wBAAgB,iBAAiB,CAC/B,WAAW,EAAE,WAAW,EAAE,GACzB,aAAa,EAAE,GAAG,SAAS,CAO7B"}
1	+ {"version":3,"file":"interface-util.d.ts","sourceRoot":"","sources":["../../../../src/controller/control/search-bar/interface-util.ts"],"names":[],"mappings":"AAEA,OAAO,EACL,WAAW,EAKX,WAAW,EAEX,aAAa,EAQd,MAAM,oBAAoB,CAAC;AAK5B;;;;;GAKG;AACH,wBAAgB,oBAAoB,IAAI,WAAW,EAAE,CAUpD;AAED;;;;;;;;;GASG;AACH,wBAAgB,mBAAmB,CAAC,WAAW,EAAE,WAAW,EAAE,GAAG;IAC/D,IAAI,EAAE,OAAO,CAAC;CACf,CAoCA;AAID,eAAe;AACf,MAAM,MAAM,aAAa,GAAG,CAC1B,UAAU,EAAE,WAAW,EACvB,UAAU,EAAE,WAAW,KACpB,IAAI,CAAC;AAEV;;;;;;;GAOG;AACH,wBAAgB,qBAAqB,CACnC,UAAU,EAAE,WAAW,EACvB,IAAI,CAAC,EAAE;IAAE,KAAK,EAAE,aAAa,CAAA;CAAE,GAC9B,WAAW,CA8Db;AAED;;;;;;;;GAQG;AACH,wBAAgB,eAAe,CAC7B,WAAW,EAAE,WAAW,EAAE,EAC1B,IAAI,CAAC,EAAE;IAAE,KAAK,EAAE,aAAa,CAAA;CAAE,GAC9B,WAAW,EAAE,GAAG,SAAS,CAO3B;AAID;;;;;;;GAOG;AACH,wBAAgB,uBAAuB,CAAC,IAAI,EAAE,aAAa,GAAG,WAAW,CAqExE;AAED;;;;;;;GAOG;AACH,wBAAgB,uBAAuB,CACrC,UAAU,EAAE,WAAW,GACtB,aAAa,CAiEf;AAED;;;;;;;;GAQG;AACH,wBAAgB,iBAAiB,CAC/B,WAAW,EAAE,WAAW,EAAE,GACzB,aAAa,EAAE,GAAG,SAAS,CAO7B"}

package/out/controller/control/search-bar/interface-util.js CHANGED Viewed

@@ -50,6 +50,11 @@ export function validateFilterNodes(filterNodes) {
             // ITEMS必须要有属性和操作符并
             hasError = !node.field || !node.valueOP;
         }
+        else if (node.nodeType === 'CUSTOM') {
+            hasFilter = true;
+            // CUSTOM 必须要有自定义类型和自定义条件
+            hasError = !node.customType || !node.customCond;
+        }
         else {
             // 分组节点必须要有逻辑类型
             hasError = !node.logicType;
@@ -100,6 +105,14 @@ export function filterNode2SearchCond(filterNode, opts) {
         }
         result = temp;
     }
+    else if (filterNode.nodeType === 'CUSTOM') {
+        const temp = {
+            condtype: 'CUSTOM',
+            customtype: filterNode.customType,
+            customcond: filterNode.customCond,
+        };
+        result = temp;
+    }
     else {
         // ITEMS
         const temp = {
@@ -177,6 +190,14 @@ export function SearchCondEx2filterNode(cond) {
         }
         result = temp;
     }
+    else if (cond.condtype === 'CUSTOM') {
+        const temp = {
+            nodeType: 'CUSTOM',
+            customType: cond.customtype,
+            customCond: cond.customcond,
+        };
+        result = temp;
+    }
     else {
         // ITEMS
         const temp = {
@@ -238,6 +259,14 @@ export function filterNode2SearchCondEx(filterNode) {
         }
         result = temp;
     }
+    else if (filterNode.nodeType === 'CUSTOM') {
+        const temp = {
+            condtype: 'CUSTOM',
+            customtype: filterNode.customType,
+            customcond: filterNode.customCond,
+        };
+        result = temp;
+    }
     else {
         // ITEMS
         const temp = {

package/out/engine/md-view.engine.js CHANGED Viewed

@@ -219,8 +219,8 @@ export class MDViewEngine extends ViewEngineBase {
         const { data, event } = args;
         // 添加选中数据的主键
         const context = (args.context || this.view.context).clone();
-        // 添加srfpaginationviewid到上下文
-        context.srfpaginationviewid = this.view.id;
+        // 添加srfnavctrlid到上下文
+        context.srfnavctrlid = this.xdataControl.ctrlId;
         const params = args.params || this.view.params;
         const deName = ((_a = data[0].srfdecodename) === null || _a === void 0 ? void 0 : _a.toLowerCase()) ||
             calcDeCodeNameById(this.xdataControl.model.appDataEntityId);

package/out/global/global-util/global-util.d.ts CHANGED Viewed

@@ -1,6 +1,6 @@
 import { IExcelUtil } from '../../interface';
 import { UIActionUtil } from '../../ui-action';
-import { TextUtil, LayoutPanelUtil, HandlebarsUtil, RawValueUtil, ThemeUtil, ErrorHandlerCenter, ViewStack, AnimeUtil, FileUtil, ShortCutUtil, BIReportUtil } from '../../utils';
+import { TextUtil, LayoutPanelUtil, HandlebarsUtil, RawValueUtil, ThemeUtil, ErrorHandlerCenter, ViewStack, AnimeUtil, FileUtil, ShortCutUtil, BIReportUtil, RecordNavUtil } from '../../utils';
 /**
  * 全局工具方法或对象
  *
@@ -96,6 +96,13 @@ export declare class GlobalUtil {
      * @date 2024-06-30 11:06:13
      */
     readonly biReport: BIReportUtil;
+    /**
+     * 记录导航工具类
+     *
+     * @author tony001
+     * @date 2024-07-15 13:07:51
+     */
+    readonly record: RecordNavUtil;
     constructor();
     /**
      * 获取导出Excel工具类对象

package/out/global/global-util/global-util.d.ts.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"global-util.d.ts","sourceRoot":"","sources":["../../../src/global/global-util/global-util.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,UAAU,EAAE,MAAM,iBAAiB,CAAC;AAC7C,OAAO,EAAE,YAAY,EAAE,MAAM,iBAAiB,CAAC;AAC/C,OAAO,EACL,QAAQ,EACR,eAAe,EACf,cAAc,EACd,YAAY,EACZ,SAAS,EAET,kBAAkB,EAClB,SAAS,EACT,SAAS,EACT,QAAQ,EACR,YAAY,EACZ,YAAY,~~EACb~~,MAAM,aAAa,CAAC;AAKrB;;;;;;;GAOG;AACH,qBAAa,UAAU;IACrB;;;;;OAKG;IACH,QAAQ,CAAC,WAAW,kBAAyB;IAE7C;;;;;OAKG;IACH,QAAQ,CAAC,KAAK,YAAmB;IAEjC;;;;;OAKG;IACH,QAAQ,CAAC,IAAI,WAAkB;IAE/B;;;;;OAKG;IACH,QAAQ,CAAC,GAAG,iBAAwB;IAEpC;;;;;OAKG;IACH,QAAQ,CAAC,QAAQ,eAAsB;IAEvC;;;;;OAKG;IACH,QAAQ,CAAC,MAAM,sBAAgB;IAE/B;;;;OAIG;IACH,QAAQ,CAAC,KAAK,qBAA4B;IAE1C;;;;;OAKG;IACH,QAAQ,CAAC,SAAS,YAAmB;IAErC;;;;;;OAMG;IACH,QAAQ,CAAC,KAAK,YAAmB;IAEjC;;;;;;OAMG;IACH,QAAQ,CAAC,QAAQ,eAAsB;IAEvC;;;;;;OAMG;IACH,QAAQ,CAAC,IAAI,WAAkB;IAE/B;;;;;OAKG;IACH,QAAQ,CAAC,QAAQ,eAAsB;;~~IAMvC~~;;;;OAIG;IACH,YAAY,CAAC,EAAE,MAAM,OAAO,CAAC,UAAU,CAAC,CAAC;IAEzC;;;;;OAKG;IACH,cAAc,IAAI,IAAI;IAOtB;;;;;OAKG;IACH,gBAAgB,IAAI,IAAI;IASxB;;;;;;OAMG;IACH,eAAe,CAAC,KAAK,EAAE,MAAM,GAAG,IAAI;IAiBpC;;;;;OAKG;IACH,cAAc,IAAI,OAAO;IAIzB;;;;;OAKG;IACH,eAAe,IAAI,OAAO,EAAE;CAG7B"}
1	+ {"version":3,"file":"global-util.d.ts","sourceRoot":"","sources":["../../../src/global/global-util/global-util.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,UAAU,EAAE,MAAM,iBAAiB,CAAC;AAC7C,OAAO,EAAE,YAAY,EAAE,MAAM,iBAAiB,CAAC;AAC/C,OAAO,EACL,QAAQ,EACR,eAAe,EACf,cAAc,EACd,YAAY,EACZ,SAAS,EAET,kBAAkB,EAClB,SAAS,EACT,SAAS,EACT,QAAQ,EACR,YAAY,EACZ,YAAY,EACZ,aAAa,EACd,MAAM,aAAa,CAAC;AAKrB;;;;;;;GAOG;AACH,qBAAa,UAAU;IACrB;;;;;OAKG;IACH,QAAQ,CAAC,WAAW,kBAAyB;IAE7C;;;;;OAKG;IACH,QAAQ,CAAC,KAAK,YAAmB;IAEjC;;;;;OAKG;IACH,QAAQ,CAAC,IAAI,WAAkB;IAE/B;;;;;OAKG;IACH,QAAQ,CAAC,GAAG,iBAAwB;IAEpC;;;;;OAKG;IACH,QAAQ,CAAC,QAAQ,eAAsB;IAEvC;;;;;OAKG;IACH,QAAQ,CAAC,MAAM,sBAAgB;IAE/B;;;;OAIG;IACH,QAAQ,CAAC,KAAK,qBAA4B;IAE1C;;;;;OAKG;IACH,QAAQ,CAAC,SAAS,YAAmB;IAErC;;;;;;OAMG;IACH,QAAQ,CAAC,KAAK,YAAmB;IAEjC;;;;;;OAMG;IACH,QAAQ,CAAC,QAAQ,eAAsB;IAEvC;;;;;;OAMG;IACH,QAAQ,CAAC,IAAI,WAAkB;IAE/B;;;;;OAKG;IACH,QAAQ,CAAC,QAAQ,eAAsB;IAEvC;;;;;OAKG;IACH,QAAQ,CAAC,MAAM,gBAAuB;;IAMtC;;;;OAIG;IACH,YAAY,CAAC,EAAE,MAAM,OAAO,CAAC,UAAU,CAAC,CAAC;IAEzC;;;;;OAKG;IACH,cAAc,IAAI,IAAI;IAOtB;;;;;OAKG;IACH,gBAAgB,IAAI,IAAI;IASxB;;;;;;OAMG;IACH,eAAe,CAAC,KAAK,EAAE,MAAM,GAAG,IAAI;IAiBpC;;;;;OAKG;IACH,cAAc,IAAI,OAAO;IAIzB;;;;;OAKG;IACH,eAAe,IAAI,OAAO,EAAE;CAG7B"}

package/out/global/global-util/global-util.js CHANGED Viewed

@@ -1,6 +1,6 @@
 import { RuntimeError } from '@ibiz-template/core';
 import { UIActionUtil } from '../../ui-action';
-import { TextUtil, LayoutPanelUtil, HandlebarsUtil, RawValueUtil, ThemeUtil, DefaultErrorHandler, ErrorHandlerCenter, ViewStack, AnimeUtil, FileUtil, ShortCutUtil, BIReportUtil, } from '../../utils';
+import { TextUtil, LayoutPanelUtil, HandlebarsUtil, RawValueUtil, ThemeUtil, DefaultErrorHandler, ErrorHandlerCenter, ViewStack, AnimeUtil, FileUtil, ShortCutUtil, BIReportUtil, RecordNavUtil, } from '../../utils';
 // 保存浏览器标签原始标题
 const sourceTitle = document.title;
 /**
@@ -99,6 +99,13 @@ export class GlobalUtil {
          * @date 2024-06-30 11:06:13
          */
         this.biReport = new BIReportUtil();
+        /**
+         * 记录导航工具类
+         *
+         * @author tony001
+         * @date 2024-07-15 13:07:51
+         */
+        this.record = new RecordNavUtil();
         this.error.register(new DefaultErrorHandler());
     }
     /**

package/out/interface/controller/controller/control/i-control.controller.d.ts CHANGED Viewed

@@ -21,6 +21,14 @@ export interface IControlController<T extends IControl = IControl, S extends ICo
      * @type {IViewController}
      */
     view: IViewController;
+    /**
+     * 部件标识
+     *
+     * @author tony001
+     * @date 2024-07-15 13:07:49
+     * @type {string}
+     */
+    ctrlId: string;
     /**
      * 部件布局面板控制器
      * @author lxm

package/out/interface/controller/controller/control/i-control.controller.d.ts.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"i-control.controller.d.ts","sourceRoot":"","sources":["../../../../../src/interface/controller/controller/control/i-control.controller.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,QAAQ,EAAE,MAAM,kBAAkB,CAAC;AAC5C,OAAO,EAAE,SAAS,EAAE,aAAa,EAAE,MAAM,aAAa,CAAC;AACvD,OAAO,EAAE,aAAa,EAAE,MAAM,aAAa,CAAC;AAC5C,OAAO,EAAE,WAAW,EAAE,MAAM,iBAAiB,CAAC;AAC9C,OAAO,EAAE,eAAe,EAAE,MAAM,2BAA2B,CAAC;AAC5D,OAAO,EAAE,0BAA0B,EAAE,MAAM,kCAAkC,CAAC;AAC9E,OAAO,EAAE,qBAAqB,EAAE,MAAM,6BAA6B,CAAC;AAEpE;;;;;;;GAOG;AACH,MAAM,WAAW,kBAAkB,CACjC,CAAC,SAAS,QAAQ,GAAG,QAAQ,EAC7B,CAAC,SAAS,aAAa,GAAG,aAAa,EACvC,CAAC,SAAS,aAAa,GAAG,aAAa,CACvC,SAAQ,WAAW,CAAC,CAAC,EAAE,CAAC,EAAE,CAAC,CAAC;IAC5B;;;;;OAKG;IACH,IAAI,EAAE,eAAe,CAAC;IAEtB;;;;;OAKG;IACH,WAAW,CAAC,EAAE,0BAA0B,CAAC;IAEzC;;;;;;OAMG;IACH,SAAS,CAAC,EAAE,qBAAqB,CAAC;IAElC;;;;;OAKG;IACH,YAAY,IAAI,OAAO,CAAC,IAAI,CAAC,CAAC;IAE9B;;;;;OAKG;IACH,UAAU,IAAI,OAAO,CAAC,IAAI,CAAC,CAAC;IAE5B;;;;;OAKG;IACH,WAAW,IAAI,IAAI,CAAC;IAEpB;;;;;OAKG;IACH,aAAa,IAAI,IAAI,CAAC;IAEtB;;;;;;OAMG;IACH,mBAAmB,CAAC,IAAI,EAAE;QAAE,OAAO,CAAC,EAAE,QAAQ,CAAC;QAAC,MAAM,CAAC,EAAE,OAAO,CAAA;KAAE,GAAG,IAAI,CAAC;IAE1E;;;;;OAKG;IACH,YAAY,IAAI,IAAI,CAAC,SAAS,EAAE,WAAW,CAAC,CAAC;IAE7C;;;;;;;;;;OAUG;IACH,YAAY,CAAC,EAAE,EAAE,MAAM,IAAI,EAAE,IAAI,EAAE;QAAE,GAAG,EAAE,MAAM,CAAC;QAAC,KAAK,CAAC,EAAE,MAAM,CAAA;KAAE,GAAG,IAAI,CAAC;CAC3E"}
1	+ {"version":3,"file":"i-control.controller.d.ts","sourceRoot":"","sources":["../../../../../src/interface/controller/controller/control/i-control.controller.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,QAAQ,EAAE,MAAM,kBAAkB,CAAC;AAC5C,OAAO,EAAE,SAAS,EAAE,aAAa,EAAE,MAAM,aAAa,CAAC;AACvD,OAAO,EAAE,aAAa,EAAE,MAAM,aAAa,CAAC;AAC5C,OAAO,EAAE,WAAW,EAAE,MAAM,iBAAiB,CAAC;AAC9C,OAAO,EAAE,eAAe,EAAE,MAAM,2BAA2B,CAAC;AAC5D,OAAO,EAAE,0BAA0B,EAAE,MAAM,kCAAkC,CAAC;AAC9E,OAAO,EAAE,qBAAqB,EAAE,MAAM,6BAA6B,CAAC;AAEpE;;;;;;;GAOG;AACH,MAAM,WAAW,kBAAkB,CACjC,CAAC,SAAS,QAAQ,GAAG,QAAQ,EAC7B,CAAC,SAAS,aAAa,GAAG,aAAa,EACvC,CAAC,SAAS,aAAa,GAAG,aAAa,CACvC,SAAQ,WAAW,CAAC,CAAC,EAAE,CAAC,EAAE,CAAC,CAAC;IAC5B;;;;;OAKG;IACH,IAAI,EAAE,eAAe,CAAC;IAEtB;;;;;;OAMG;IACH,MAAM,EAAE,MAAM,CAAC;IAEf;;;;;OAKG;IACH,WAAW,CAAC,EAAE,0BAA0B,CAAC;IAEzC;;;;;;OAMG;IACH,SAAS,CAAC,EAAE,qBAAqB,CAAC;IAElC;;;;;OAKG;IACH,YAAY,IAAI,OAAO,CAAC,IAAI,CAAC,CAAC;IAE9B;;;;;OAKG;IACH,UAAU,IAAI,OAAO,CAAC,IAAI,CAAC,CAAC;IAE5B;;;;;OAKG;IACH,WAAW,IAAI,IAAI,CAAC;IAEpB;;;;;OAKG;IACH,aAAa,IAAI,IAAI,CAAC;IAEtB;;;;;;OAMG;IACH,mBAAmB,CAAC,IAAI,EAAE;QAAE,OAAO,CAAC,EAAE,QAAQ,CAAC;QAAC,MAAM,CAAC,EAAE,OAAO,CAAA;KAAE,GAAG,IAAI,CAAC;IAE1E;;;;;OAKG;IACH,YAAY,IAAI,IAAI,CAAC,SAAS,EAAE,WAAW,CAAC,CAAC;IAE7C;;;;;;;;;;OAUG;IACH,YAAY,CAAC,EAAE,EAAE,MAAM,IAAI,EAAE,IAAI,EAAE;QAAE,GAAG,EAAE,MAAM,CAAC;QAAC,KAAK,CAAC,EAAE,MAAM,CAAA;KAAE,GAAG,IAAI,CAAC;CAC3E"}

package/out/interface/controller/controller/control/i-md-control.controller.d.ts CHANGED Viewed

@@ -97,5 +97,37 @@ export interface IMDControlController<T extends IMDControl = IMDControl, S exten
      * @return {*}  {Promise<void>}
      */
     setActive(data: IData): Promise<void>;
+    /**
+     * 跳转第一页
+     *
+     * @author tony001
+     * @date 2024-07-15 14:07:08
+     * @return {*}  {Promise<IData[]>}
+     */
+    goToFirstPage(): Promise<IData[]>;
+    /**
+     * 跳转上一页
+     *
+     * @author tony001
+     * @date 2024-07-15 14:07:59
+     * @return {*}  {Promise<IData[]>}
+     */
+    goToPreviousPage(): Promise<IData[]>;
+    /**
+     * 跳转下一页
+     *
+     * @author tony001
+     * @date 2024-07-15 14:07:19
+     * @return {*}  {Promise<IData[]>}
+     */
+    goToNextPage(): Promise<IData[]>;
+    /**
+     * 跳转最后一页
+     *
+     * @author tony001
+     * @date 2024-07-15 14:07:32
+     * @return {*}  {Promise<IData[]>}
+     */
+    goToLastPage(): Promise<IData[]>;
 }
 //# sourceMappingURL=i-md-control.controller.d.ts.map

package/out/interface/controller/controller/control/i-md-control.controller.d.ts.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"i-md-control.controller.d.ts","sourceRoot":"","sources":["../../../../../src/interface/controller/controller/control/i-md-control.controller.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,UAAU,EAAE,MAAM,kBAAkB,CAAC;AAC9C,OAAO,EAAE,kBAAkB,EAAE,MAAM,iBAAiB,CAAC;AACrD,OAAO,EAAE,eAAe,EAAE,MAAM,aAAa,CAAC;AAC9C,OAAO,EAAE,eAAe,EAAE,MAAM,aAAa,CAAC;AAC9C,OAAO,EAAE,kBAAkB,EAAE,MAAM,wBAAwB,CAAC;AAE5D,MAAM,WAAW,gBAAiB,SAAQ,kBAAkB;IAC1D;;OAEG;IACH,aAAa,CAAC,EAAE,OAAO,CAAC;IAExB;;;;;;OAMG;IACH,UAAU,CAAC,EAAE,OAAO,CAAC;CACtB;AAED,MAAM,WAAW,kBAAmB,SAAQ,kBAAkB;IAC5D;;;;;OAKG;IACH,UAAU,CAAC,EAAE,OAAO,CAAC;CACtB;AAED;;;;;;;GAOG;AACH,MAAM,WAAW,oBAAoB,CACnC,CAAC,SAAS,UAAU,GAAG,UAAU,EACjC,CAAC,SAAS,eAAe,GAAG,eAAe,EAC3C,CAAC,SAAS,eAAe,GAAG,eAAe,CAC3C,SAAQ,kBAAkB,CAAC,CAAC,EAAE,CAAC,EAAE,CAAC,CAAC;IACnC;;;;;OAKG;IACH,IAAI,CAAC,IAAI,CAAC,EAAE,gBAAgB,GAAG,OAAO,CAAC,KAAK,EAAE,CAAC,CAAC;IAEhD;;;;;OAKG;IACH,MAAM,CAAC,IAAI,CAAC,EAAE,kBAAkB,GAAG,OAAO,CAAC,IAAI,CAAC,CAAC;IAEjD;;;;;OAKG;IACH,OAAO,IAAI,OAAO,CAAC,IAAI,CAAC,CAAC;IAEzB;;;;;OAKG;IACH,UAAU,IAAI,OAAO,CAAC,IAAI,CAAC,CAAC;IAE5B;;;;;;OAMG;IACH,UAAU,CAAC,KAAK,EAAE;QAAE,KAAK,EAAE,UAAU,CAAA;KAAE,GAAG,OAAO,CAAC,IAAI,CAAC,CAAC;IAExD;;;;;OAKG;IACH,OAAO,IAAI,KAAK,EAAE,CAAC;IAEnB;;;;;;;OAOG;IACH,YAAY,CAAC,SAAS,EAAE,KAAK,EAAE,GAAG,IAAI,CAAC;IAEvC;;;;;;OAMG;IACH,SAAS,CAAC,IAAI,EAAE,KAAK,GAAG,OAAO,CAAC,IAAI,CAAC,CAAC;~~CACvC~~"}
1	+ {"version":3,"file":"i-md-control.controller.d.ts","sourceRoot":"","sources":["../../../../../src/interface/controller/controller/control/i-md-control.controller.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,UAAU,EAAE,MAAM,kBAAkB,CAAC;AAC9C,OAAO,EAAE,kBAAkB,EAAE,MAAM,iBAAiB,CAAC;AACrD,OAAO,EAAE,eAAe,EAAE,MAAM,aAAa,CAAC;AAC9C,OAAO,EAAE,eAAe,EAAE,MAAM,aAAa,CAAC;AAC9C,OAAO,EAAE,kBAAkB,EAAE,MAAM,wBAAwB,CAAC;AAE5D,MAAM,WAAW,gBAAiB,SAAQ,kBAAkB;IAC1D;;OAEG;IACH,aAAa,CAAC,EAAE,OAAO,CAAC;IAExB;;;;;;OAMG;IACH,UAAU,CAAC,EAAE,OAAO,CAAC;CACtB;AAED,MAAM,WAAW,kBAAmB,SAAQ,kBAAkB;IAC5D;;;;;OAKG;IACH,UAAU,CAAC,EAAE,OAAO,CAAC;CACtB;AAED;;;;;;;GAOG;AACH,MAAM,WAAW,oBAAoB,CACnC,CAAC,SAAS,UAAU,GAAG,UAAU,EACjC,CAAC,SAAS,eAAe,GAAG,eAAe,EAC3C,CAAC,SAAS,eAAe,GAAG,eAAe,CAC3C,SAAQ,kBAAkB,CAAC,CAAC,EAAE,CAAC,EAAE,CAAC,CAAC;IACnC;;;;;OAKG;IACH,IAAI,CAAC,IAAI,CAAC,EAAE,gBAAgB,GAAG,OAAO,CAAC,KAAK,EAAE,CAAC,CAAC;IAEhD;;;;;OAKG;IACH,MAAM,CAAC,IAAI,CAAC,EAAE,kBAAkB,GAAG,OAAO,CAAC,IAAI,CAAC,CAAC;IAEjD;;;;;OAKG;IACH,OAAO,IAAI,OAAO,CAAC,IAAI,CAAC,CAAC;IAEzB;;;;;OAKG;IACH,UAAU,IAAI,OAAO,CAAC,IAAI,CAAC,CAAC;IAE5B;;;;;;OAMG;IACH,UAAU,CAAC,KAAK,EAAE;QAAE,KAAK,EAAE,UAAU,CAAA;KAAE,GAAG,OAAO,CAAC,IAAI,CAAC,CAAC;IAExD;;;;;OAKG;IACH,OAAO,IAAI,KAAK,EAAE,CAAC;IAEnB;;;;;;;OAOG;IACH,YAAY,CAAC,SAAS,EAAE,KAAK,EAAE,GAAG,IAAI,CAAC;IAEvC;;;;;;OAMG;IACH,SAAS,CAAC,IAAI,EAAE,KAAK,GAAG,OAAO,CAAC,IAAI,CAAC,CAAC;IAEtC;;;;;;OAMG;IACH,aAAa,IAAI,OAAO,CAAC,KAAK,EAAE,CAAC,CAAC;IAElC;;;;;;OAMG;IACH,gBAAgB,IAAI,OAAO,CAAC,KAAK,EAAE,CAAC,CAAC;IAErC;;;;;;OAMG;IACH,YAAY,IAAI,OAAO,CAAC,KAAK,EAAE,CAAC,CAAC;IAEjC;;;;;;OAMG;IACH,YAAY,IAAI,OAAO,CAAC,KAAK,EAAE,CAAC,CAAC;CAClC"}

package/out/interface/controller/state/control/search-bar/i-filter-node.d.ts CHANGED Viewed

@@ -1,6 +1,6 @@
 import { ValueOP } from '../../../../../constant';
 import { ITEMS_COND_OP } from './i-search-cond';
-export type IFilterNode = IFilterNodeGroup | IFilterNodeField | IFilterNodeItems;
+export type IFilterNode = IFilterNodeGroup | IFilterNodeField | IFilterNodeItems | IFilterNodeCustom;
 /**
  * 过滤节点（分组）
  * @author lxm
@@ -154,4 +154,46 @@ export interface IFilterNodeItems {
      */
     children: IFilterNode[];
 }
+/**
+ * 过滤节点（自定义）
+ *
+ * @author tony001
+ * @date 2024-07-16 19:07:33
+ * @export
+ * @interface IFilterNodeCustom
+ */
+export interface IFilterNodeCustom {
+    /**
+     * 节点类型
+     *
+     * @author tony001
+     * @date 2024-07-16 19:07:23
+     * @type {'CUSTOM'}
+     */
+    nodeType: 'CUSTOM';
+    /**
+     * 自定义类型
+     *
+     * @author tony001
+     * @date 2024-07-16 19:07:36
+     * @type {('PQL' | string)}
+     */
+    customType: 'PQL' | string;
+    /**
+     * 自定义条件
+     *
+     * @author tony001
+     * @date 2024-07-16 19:07:48
+     * @type {string}
+     */
+    customCond: string;
+    /**
+     * 隐藏，不显示
+     *
+     * @author tony001
+     * @date 2024-07-16 21:07:01
+     * @type {boolean}
+     */
+    hidden?: boolean;
+}
 //# sourceMappingURL=i-filter-node.d.ts.map

package/out/interface/controller/state/control/search-bar/i-filter-node.d.ts.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"i-filter-node.d.ts","sourceRoot":"","sources":["../../../../../../src/interface/controller/state/control/search-bar/i-filter-node.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,OAAO,EAAE,MAAM,yBAAyB,CAAC;AAClD,OAAO,EAAE,aAAa,EAAE,MAAM,iBAAiB,CAAC;AAEhD,MAAM,MAAM,WAAW,GACnB,gBAAgB,GAChB,gBAAgB,GAChB,gBAAgB,CAAC;~~AAErB~~;;;;;;GAMG;AACH,MAAM,WAAW,gBAAgB;IAC/B;;;;;OAKG;IACH,QAAQ,EAAE,OAAO,CAAC;IAElB;;;;;OAKG;IACH,SAAS,EAAE,KAAK,GAAG,IAAI,CAAC;IAExB;;;;;OAKG;IACH,OAAO,CAAC,EAAE,OAAO,CAAC;IAElB;;;;;OAKG;IACH,MAAM,CAAC,EAAE,OAAO,CAAC;IAEjB;;;;;OAKG;IACH,QAAQ,EAAE,WAAW,EAAE,CAAC;CACzB;AAED;;;;;;GAMG;AACH,MAAM,WAAW,gBAAgB;IAC/B;;;;;OAKG;IACH,QAAQ,EAAE,OAAO,CAAC;IAElB;;;;;OAKG;IACH,KAAK,EAAE,MAAM,GAAG,IAAI,CAAC;IAErB;;;;;OAKG;IACH,KAAK,EAAE,OAAO,GAAG,IAAI,CAAC;IAEtB;;;;;OAKG;IACH,OAAO,EAAE,OAAO,GAAG,IAAI,CAAC;IAExB;;;;;OAKG;IACH,QAAQ,CAAC,EAAE,OAAO,CAAC;IAEnB;;;;;OAKG;IACH,MAAM,CAAC,EAAE,OAAO,CAAC;IAEjB;;;;;OAKG;IACH,SAAS,CAAC,EAAE,OAAO,CAAC;CACrB;AAED;;;;;;GAMG;AACH,MAAM,WAAW,gBAAgB;IAC/B;;;;;OAKG;IACH,QAAQ,EAAE,OAAO,CAAC;IAElB;;;;;OAKG;IACH,KAAK,EAAE,MAAM,GAAG,IAAI,CAAC;IAErB;;;;;OAKG;IACH,OAAO,EAAE,aAAa,GAAG,IAAI,CAAC;IAE9B;;;;;OAKG;IACH,MAAM,CAAC,EAAE,OAAO,CAAC;IAEjB;;;;;OAKG;IACH,MAAM,CAAC,EAAE,OAAO,CAAC;IAEjB;;;;;OAKG;IACH,QAAQ,EAAE,WAAW,EAAE,CAAC;CACzB"}
1	+ {"version":3,"file":"i-filter-node.d.ts","sourceRoot":"","sources":["../../../../../../src/interface/controller/state/control/search-bar/i-filter-node.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,OAAO,EAAE,MAAM,yBAAyB,CAAC;AAClD,OAAO,EAAE,aAAa,EAAE,MAAM,iBAAiB,CAAC;AAEhD,MAAM,MAAM,WAAW,GACnB,gBAAgB,GAChB,gBAAgB,GAChB,gBAAgB,GAChB,iBAAiB,CAAC;AAEtB;;;;;;GAMG;AACH,MAAM,WAAW,gBAAgB;IAC/B;;;;;OAKG;IACH,QAAQ,EAAE,OAAO,CAAC;IAElB;;;;;OAKG;IACH,SAAS,EAAE,KAAK,GAAG,IAAI,CAAC;IAExB;;;;;OAKG;IACH,OAAO,CAAC,EAAE,OAAO,CAAC;IAElB;;;;;OAKG;IACH,MAAM,CAAC,EAAE,OAAO,CAAC;IAEjB;;;;;OAKG;IACH,QAAQ,EAAE,WAAW,EAAE,CAAC;CACzB;AAED;;;;;;GAMG;AACH,MAAM,WAAW,gBAAgB;IAC/B;;;;;OAKG;IACH,QAAQ,EAAE,OAAO,CAAC;IAElB;;;;;OAKG;IACH,KAAK,EAAE,MAAM,GAAG,IAAI,CAAC;IAErB;;;;;OAKG;IACH,KAAK,EAAE,OAAO,GAAG,IAAI,CAAC;IAEtB;;;;;OAKG;IACH,OAAO,EAAE,OAAO,GAAG,IAAI,CAAC;IAExB;;;;;OAKG;IACH,QAAQ,CAAC,EAAE,OAAO,CAAC;IAEnB;;;;;OAKG;IACH,MAAM,CAAC,EAAE,OAAO,CAAC;IAEjB;;;;;OAKG;IACH,SAAS,CAAC,EAAE,OAAO,CAAC;CACrB;AAED;;;;;;GAMG;AACH,MAAM,WAAW,gBAAgB;IAC/B;;;;;OAKG;IACH,QAAQ,EAAE,OAAO,CAAC;IAElB;;;;;OAKG;IACH,KAAK,EAAE,MAAM,GAAG,IAAI,CAAC;IAErB;;;;;OAKG;IACH,OAAO,EAAE,aAAa,GAAG,IAAI,CAAC;IAE9B;;;;;OAKG;IACH,MAAM,CAAC,EAAE,OAAO,CAAC;IAEjB;;;;;OAKG;IACH,MAAM,CAAC,EAAE,OAAO,CAAC;IAEjB;;;;;OAKG;IACH,QAAQ,EAAE,WAAW,EAAE,CAAC;CACzB;AAED;;;;;;;GAOG;AACH,MAAM,WAAW,iBAAiB;IAChC;;;;;;OAMG;IACH,QAAQ,EAAE,QAAQ,CAAC;IAEnB;;;;;;OAMG;IACH,UAAU,EAAE,KAAK,GAAG,MAAM,CAAC;IAE3B;;;;;;OAMG;IACH,UAAU,EAAE,MAAM,CAAC;IAEnB;;;;;;OAMG;IACH,MAAM,CAAC,EAAE,OAAO,CAAC;CAClB"}

package/out/interface/controller/state/control/search-bar/i-search-cond-ex.d.ts CHANGED Viewed

@@ -1,5 +1,5 @@
-import { ISearchCondField, ISearchCondGroup, ISearchCondItems } from './i-search-cond';
-export type ISearchCondEx = ISearchCondExGroup | ISearchCondExField | ISearchCondExItems;
+import { ISearchCondCustom, ISearchCondField, ISearchCondGroup, ISearchCondItems } from './i-search-cond';
+export type ISearchCondEx = ISearchCondExGroup | ISearchCondExField | ISearchCondExItems | ISearchCondExCustom;
 /**
  * 分组条件(后台保存格式)
  * @author lxm
@@ -62,4 +62,23 @@ export interface ISearchCondExItems extends ISearchCondItems {
      */
     simple?: boolean;
 }
+/**
+ * 搜索自定义条件
+ *
+ * @author tony001
+ * @date 2024-07-16 21:07:13
+ * @export
+ * @interface ISearchCondExCustom
+ * @extends {ISearchCondCustom}
+ */
+export interface ISearchCondExCustom extends ISearchCondCustom {
+    /**
+     * 隐藏条件
+     *
+     * @author tony001
+     * @date 2024-07-16 21:07:18
+     * @type {boolean}
+     */
+    hidden?: boolean;
+}
 //# sourceMappingURL=i-search-cond-ex.d.ts.map

package/out/interface/controller/state/control/search-bar/i-search-cond-ex.d.ts.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"i-search-cond-ex.d.ts","sourceRoot":"","sources":["../../../../../../src/interface/controller/state/control/search-bar/i-search-cond-ex.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,gBAAgB,EAChB,gBAAgB,EAChB,gBAAgB,EACjB,MAAM,iBAAiB,CAAC;AAEzB,MAAM,MAAM,aAAa,GACrB,kBAAkB,GAClB,kBAAkB,GAClB,kBAAkB,CAAC;~~AAEvB~~;;;;;;GAMG;AACH,MAAM,WAAW,kBAAmB,SAAQ,gBAAgB;IAC1D;;;;;OAKG;IACH,MAAM,CAAC,EAAE,OAAO,CAAC;CAClB;AAED;;;;;;GAMG;AACH,MAAM,WAAW,kBAAmB,SAAQ,gBAAgB;IAC1D;;;;;OAKG;IACH,MAAM,CAAC,EAAE,OAAO,CAAC;IAEjB;;;;;OAKG;IACH,SAAS,CAAC,EAAE,OAAO,CAAC;CACrB;AAED;;;;;;GAMG;AACH,MAAM,WAAW,kBAAmB,SAAQ,gBAAgB;IAC1D;;;;;OAKG;IACH,MAAM,CAAC,EAAE,OAAO,CAAC;IAEjB;;;;;OAKG;IACH,MAAM,CAAC,EAAE,OAAO,CAAC;CAClB"}
1	+ {"version":3,"file":"i-search-cond-ex.d.ts","sourceRoot":"","sources":["../../../../../../src/interface/controller/state/control/search-bar/i-search-cond-ex.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,iBAAiB,EACjB,gBAAgB,EAChB,gBAAgB,EAChB,gBAAgB,EACjB,MAAM,iBAAiB,CAAC;AAEzB,MAAM,MAAM,aAAa,GACrB,kBAAkB,GAClB,kBAAkB,GAClB,kBAAkB,GAClB,mBAAmB,CAAC;AAExB;;;;;;GAMG;AACH,MAAM,WAAW,kBAAmB,SAAQ,gBAAgB;IAC1D;;;;;OAKG;IACH,MAAM,CAAC,EAAE,OAAO,CAAC;CAClB;AAED;;;;;;GAMG;AACH,MAAM,WAAW,kBAAmB,SAAQ,gBAAgB;IAC1D;;;;;OAKG;IACH,MAAM,CAAC,EAAE,OAAO,CAAC;IAEjB;;;;;OAKG;IACH,SAAS,CAAC,EAAE,OAAO,CAAC;CACrB;AAED;;;;;;GAMG;AACH,MAAM,WAAW,kBAAmB,SAAQ,gBAAgB;IAC1D;;;;;OAKG;IACH,MAAM,CAAC,EAAE,OAAO,CAAC;IAEjB;;;;;OAKG;IACH,MAAM,CAAC,EAAE,OAAO,CAAC;CAClB;AAED;;;;;;;;GAQG;AACH,MAAM,WAAW,mBAAoB,SAAQ,iBAAiB;IAC5D;;;;;;OAMG;IACH,MAAM,CAAC,EAAE,OAAO,CAAC;CAClB"}

package/out/interface/controller/state/control/search-bar/i-search-cond.d.ts CHANGED Viewed

@@ -1,6 +1,6 @@
 import { ValueOP } from '../../../../../constant';
 export type ITEMS_COND_OP = ValueOP.EXISTS | ValueOP.NOT_EXISTS;
-export type ISearchCond = ISearchCondGroup | ISearchCondField | ISearchCondItems;
+export type ISearchCond = ISearchCondGroup | ISearchCondField | ISearchCondItems | ISearchCondCustom;
 /**
  * 分组条件
  * @author lxm
@@ -40,4 +40,17 @@ export interface ISearchCondItems {
     fieldname: string;
     searchconds?: ISearchCond[];
 }
+/**
+ * 搜索自定义条件
+ *
+ * @author tony001
+ * @date 2024-07-16 19:07:01
+ * @export
+ * @interface ISearchCondCustom
+ */
+export interface ISearchCondCustom {
+    condtype: 'CUSTOM';
+    customtype: 'PQL' | string;
+    customcond: string;
+}
 //# sourceMappingURL=i-search-cond.d.ts.map