@ibiz-template/runtime 0.7.30 → 0.7.31-alpha.1

package/out/command/app/open-app-view/open-app-view.d.ts

@@ -93,5 +93,17 @@ export declare class OpenAppViewCommand {
      * @return {*}  {Promise<void>}
      */
     protected openUserCustom(appView: IViewConfig, context: IContext, params?: IParams): Promise<IModalData>;
+    /**
+     * 独立程序弹出
+     *
+     * @author zzq
+     * @date 2024-07-19 20:07:55
+     * @protected
+     * @param {IViewConfig} appView
+     * @param {IContext} [context]
+     * @param {IParams} [params={}]
+     * @return {*}  {Promise<void>}
+     */
+    protected openPopupApp(appView: IViewConfig, context: IContext, params?: IParams): Promise<void>;
 }
 //# sourceMappingURL=open-app-view.d.ts.map

package/out/command/app/open-app-view/open-app-view.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"open-app-view.d.ts","sourceRoot":"","sources":["../../../../src/command/app/open-app-view/open-app-view.ts"],"names":[],"mappings":"AAGA,OAAO,EAAE,UAAU,EAAE,gBAAgB,EAAE,WAAW,EAAE,MAAM,oBAAoB,CAAC;AAK/E;;;;;;;GAOG;AACH,qBAAa,kBAAkB;IAC7B,MAAM,CAAC,QAAQ,CAAC,GAAG,wBAAwB;;IAM3C;;;;;;;;;;OAUG;IACG,IAAI,CACR,SAAS,EAAE,MAAM,EACjB,QAAQ,EAAE,QAAQ,EAClB,MAAM,GAAE,OAAY,EACpB,IAAI,GAAE,gBAAqB,GAC1B,OAAO,CAAC,UAAU,GAAG,IAAI,CAAC;IAoF7B;;;;;;;;;OASG;IACH,SAAS,CAAC,gBAAgB,CACxB,OAAO,EAAE,WAAW,EACpB,OAAO,EAAE,QAAQ,EACjB,MAAM,GAAE,OAAY,EACpB,YAAY,GAAE,KAAU,GACvB,OAAO,CAAC,UAAU,CAAC;IAItB;;;;;;;;;;OAUG;IACH,SAAS,CAAC,uBAAuB,CAC/B,OAAO,EAAE,WAAW,EACpB,OAAO,EAAE,QAAQ,EACjB,MAAM,GAAE,OAAY,GACnB,OAAO,CAAC,UAAU,CAAC;IAItB;;;;;;;;;;OAUG;cACa,SAAS,CACvB,OAAO,EAAE,WAAW,EACpB,OAAO,EAAE,QAAQ,EACjB,MAAM,GAAE,OAAY,GACnB,OAAO,CAAC,UAAU,CAAC;IAItB;;;;;;;;;;OAUG;cACa,WAAW,CACzB,OAAO,EAAE,WAAW,EACpB,OAAO,EAAE,QAAQ,EACjB,MAAM,GAAE,OAAY,EACpB,IAAI,GAAE,gBAAqB,GAC1B,OAAO,CAAC,UAAU,CAAC;IAUtB;;;;;;;;;;OAUG;cACa,UAAU,CACxB,OAAO,EAAE,WAAW,EACpB,OAAO,EAAE,QAAQ,EACjB,MAAM,GAAE,OAAY,GACnB,OAAO,CAAC,UAAU,CAAC;IAItB;;;;;;;;;;OAUG;cACa,cAAc,CAC5B,OAAO,EAAE,WAAW,EACpB,OAAO,EAAE,QAAQ,EACjB,MAAM,GAAE,OAAY,GACnB,OAAO,CAAC,UAAU,CAAC;CAGvB"}
+{"version":3,"file":"open-app-view.d.ts","sourceRoot":"","sources":["../../../../src/command/app/open-app-view/open-app-view.ts"],"names":[],"mappings":"AAGA,OAAO,EAAE,UAAU,EAAE,gBAAgB,EAAE,WAAW,EAAE,MAAM,oBAAoB,CAAC;AAK/E;;;;;;;GAOG;AACH,qBAAa,kBAAkB;IAC7B,MAAM,CAAC,QAAQ,CAAC,GAAG,wBAAwB;;IAM3C;;;;;;;;;;OAUG;IACG,IAAI,CACR,SAAS,EAAE,MAAM,EACjB,QAAQ,EAAE,QAAQ,EAClB,MAAM,GAAE,OAAY,EACpB,IAAI,GAAE,gBAAqB,GAC1B,OAAO,CAAC,UAAU,GAAG,IAAI,CAAC;IAiF7B;;;;;;;;;OASG;IACH,SAAS,CAAC,gBAAgB,CACxB,OAAO,EAAE,WAAW,EACpB,OAAO,EAAE,QAAQ,EACjB,MAAM,GAAE,OAAY,EACpB,YAAY,GAAE,KAAU,GACvB,OAAO,CAAC,UAAU,CAAC;IAItB;;;;;;;;;;OAUG;IACH,SAAS,CAAC,uBAAuB,CAC/B,OAAO,EAAE,WAAW,EACpB,OAAO,EAAE,QAAQ,EACjB,MAAM,GAAE,OAAY,GACnB,OAAO,CAAC,UAAU,CAAC;IAItB;;;;;;;;;;OAUG;cACa,SAAS,CACvB,OAAO,EAAE,WAAW,EACpB,OAAO,EAAE,QAAQ,EACjB,MAAM,GAAE,OAAY,GACnB,OAAO,CAAC,UAAU,CAAC;IAItB;;;;;;;;;;OAUG;cACa,WAAW,CACzB,OAAO,EAAE,WAAW,EACpB,OAAO,EAAE,QAAQ,EACjB,MAAM,GAAE,OAAY,EACpB,IAAI,GAAE,gBAAqB,GAC1B,OAAO,CAAC,UAAU,CAAC;IAUtB;;;;;;;;;;OAUG;cACa,UAAU,CACxB,OAAO,EAAE,WAAW,EACpB,OAAO,EAAE,QAAQ,EACjB,MAAM,GAAE,OAAY,GACnB,OAAO,CAAC,UAAU,CAAC;IAItB;;;;;;;;;;OAUG;cACa,cAAc,CAC5B,OAAO,EAAE,WAAW,EACpB,OAAO,EAAE,QAAQ,EACjB,MAAM,GAAE,OAAY,GACnB,OAAO,CAAC,UAAU,CAAC;IAItB;;;;;;;;;;OAUG;cACa,YAAY,CAC1B,OAAO,EAAE,WAAW,EACpB,OAAO,EAAE,QAAQ,EACjB,MAAM,GAAE,OAAY,GACnB,OAAO,CAAC,IAAI,CAAC;CAGjB"}

package/out/command/app/open-app-view/open-app-view.js

@@ -78,7 +78,7 @@ export class OpenAppViewCommand {
             case 'POPUPMODAL':
                 return this.openModal(appView, context, params);
             case 'POPUPAPP':
-                throw new ModelError(appView, ibiz.i18n.t('runtime.command.app.unsupportedPopupapp'));
+                return this.openPopupApp(appView, context, params);
             case 'POPOVER':
                 return this.openPopover(appView, context, params, opts);
             case 'DRAWER_LEFT':
@@ -179,5 +179,19 @@ export class OpenAppViewCommand {
     async openUserCustom(appView, context, params = {}) {
         return ibiz.openView.custom(appView.id, context, params);
     }
+    /**
+     * 独立程序弹出
+     *
+     * @author zzq
+     * @date 2024-07-19 20:07:55
+     * @protected
+     * @param {IViewConfig} appView
+     * @param {IContext} [context]
+     * @param {IParams} [params={}]
+     * @return {*}  {Promise<void>}
+     */
+    async openPopupApp(appView, context, params = {}) {
+        return ibiz.openView.popupApp(appView.id, context, params);
+    }
 }
 OpenAppViewCommand.TAG = 'ibiz.app-view.open';

package/out/controller/control/chart/chart.controller.d.ts

@@ -53,7 +53,7 @@ export declare class ChartController extends MDControlController<IDEChart, IChar
      */
     computedClickSerieModel(arg: IData): IData | undefined;
     /**
-     * 处理查看明细参数
+     * 计算查看明细参数
      *
      * @param {IData} arg
      * @return {*}

package/out/controller/control/chart/chart.controller.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"chart.controller.d.ts","sourceRoot":"","sources":["../../../../src/controller/control/chart/chart.controller.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,QAAQ,EAAE,MAAM,kBAAkB,CAAC;AAC5C,OAAO,KAAK,EAAE,aAAa,EAAE,WAAW,EAAE,MAAM,SAAS,CAAC;AAE1D,OAAO,EAAE,qBAAqB,EAAE,MAAM,qCAAqC,CAAC;AAC5E,OAAO,EAAE,YAAY,EAAE,MAAM,iBAAiB,CAAC;AAC/C,OAAO,EACL,gBAAgB,EAChB,WAAW,EACX,WAAW,EACX,gBAAgB,EACjB,MAAM,oBAAoB,CAAC;AAC5B,OAAO,EAAE,mBAAmB,EAAE,MAAM,cAAc,CAAC;AACnD,OAAO,EAAE,eAAe,EAAE,MAAM,aAAa,CAAC;AAE9C,qBAAa,eACX,SAAQ,mBAAmB,CAAC,QAAQ,EAAE,WAAW,EAAE,WAAW,CAC9D,YAAW,gBAAgB;IAEnB,OAAO,EAAE,YAAY,CAAC;IAE9B,SAAS,KAAK,IAAI,IAAI,eAAe,CAAC,WAAW,CAAC,CAEjD;IAED;;;;;OAKG;IACH,KAAK,CAAC,EAAE,WAAW,CAAC;IAEpB;;;;;OAKG;IACH,SAAS,EAAG,qBAAqB,CAAC;IAElC;;;;;OAKG;IACH,OAAO,CAAC,EAAE,aAAa,CAAC;IAExB;;;;OAIG;IACH,YAAY,UAAQ;IAEpB,SAAS,CAAC,SAAS,IAAI,IAAI;cASX,SAAS,IAAI,OAAO,CAAC,IAAI,CAAC;IAcpC,SAAS,CAAC,IAAI,EAAE,gBAAgB,EAAE,KAAK,EAAE,KAAK,EAAE,GAAG,OAAO,CAAC,KAAK,EAAE,CAAC;IAUzE;;;;;OAKG;IACI,kBAAkB,CAAC,GAAG,GAAE,OAAc,GAAG,IAAI;IAWpD;;;;;OAKG;IACI,uBAAuB,CAAC,GAAG,EAAE,KAAK,GAAG,KAAK,GAAG,SAAS;IAmB7D;;;;;;OAMG;IACI,wBAAwB,CAAC,GAAG,EAAE,KAAK,GAAG,KAAK;IA0ClD;;;;OAIG;IACI,cAAc,IAAI,IAAI;IAc7B;;;;;;OAMG;IACI,YAAY,CAAC,UAAU,EAAE,MAAM,GAAG,MAAM;IAW/C;;;;;;OAMG;IACI,yBAAyB,IAAI,IAAI;IAuDxC;;;;;;;;OAQG;IACI,2BAA2B,IAAI,IAAI;IAwD1C;;;;OAIG;IACI,eAAe,IAAI,IAAI;IAU9B;;;;;OAKG;IACH,SAAS,CAAC,KAAK,EAAE,WAAW,GAAG,IAAI;IAUnC;;;;;;OAMG;IACH,WAAW,CAAC,IAAI,GAAE,KAAK,EAAqB,GAAG,IAAI;IASnD;;;;OAIG;IACG,WAAW,IAAI,OAAO,CAAC,IAAI,CAAC;IAgBlC;;;;OAIG;IACH,WAAW,IAAI,IAAI;cAMH,WAAW,IAAI,OAAO,CAAC,IAAI,CAAC;CAK7C"}
+{"version":3,"file":"chart.controller.d.ts","sourceRoot":"","sources":["../../../../src/controller/control/chart/chart.controller.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,QAAQ,EAAE,MAAM,kBAAkB,CAAC;AAC5C,OAAO,KAAK,EAAE,aAAa,EAAE,WAAW,EAAE,MAAM,SAAS,CAAC;AAC1D,OAAO,EAAE,qBAAqB,EAAE,MAAM,qCAAqC,CAAC;AAC5E,OAAO,EAAE,YAAY,EAAE,MAAM,iBAAiB,CAAC;AAC/C,OAAO,EACL,gBAAgB,EAChB,WAAW,EACX,WAAW,EACX,gBAAgB,EACjB,MAAM,oBAAoB,CAAC;AAC5B,OAAO,EAAE,mBAAmB,EAAE,MAAM,cAAc,CAAC;AACnD,OAAO,EAAE,eAAe,EAAE,MAAM,aAAa,CAAC;AAE9C,qBAAa,eACX,SAAQ,mBAAmB,CAAC,QAAQ,EAAE,WAAW,EAAE,WAAW,CAC9D,YAAW,gBAAgB;IAEnB,OAAO,EAAE,YAAY,CAAC;IAE9B,SAAS,KAAK,IAAI,IAAI,eAAe,CAAC,WAAW,CAAC,CAEjD;IAED;;;;;OAKG;IACH,KAAK,CAAC,EAAE,WAAW,CAAC;IAEpB;;;;;OAKG;IACH,SAAS,EAAG,qBAAqB,CAAC;IAElC;;;;;OAKG;IACH,OAAO,CAAC,EAAE,aAAa,CAAC;IAExB;;;;OAIG;IACH,YAAY,UAAQ;IAEpB,SAAS,CAAC,SAAS,IAAI,IAAI;cASX,SAAS,IAAI,OAAO,CAAC,IAAI,CAAC;IAcpC,SAAS,CAAC,IAAI,EAAE,gBAAgB,EAAE,KAAK,EAAE,KAAK,EAAE,GAAG,OAAO,CAAC,KAAK,EAAE,CAAC;IAUzE;;;;;OAKG;IACI,kBAAkB,CAAC,GAAG,GAAE,OAAc,GAAG,IAAI;IAyBpD;;;;;OAKG;IACI,uBAAuB,CAAC,GAAG,EAAE,KAAK,GAAG,KAAK,GAAG,SAAS;IA8B7D;;;;;;OAMG;IACI,wBAAwB,CAAC,GAAG,EAAE,KAAK,GAAG,KAAK;IAsDlD;;;;OAIG;IACI,cAAc,IAAI,IAAI;IAc7B;;;;;;OAMG;IACI,YAAY,CAAC,UAAU,EAAE,MAAM,GAAG,MAAM;IAW/C;;;;;;OAMG;IACI,yBAAyB,IAAI,IAAI;IAuDxC;;;;;;;;OAQG;IACI,2BAA2B,IAAI,IAAI;IAwD1C;;;;OAIG;IACI,eAAe,IAAI,IAAI;IAU9B;;;;;OAKG;IACH,SAAS,CAAC,KAAK,EAAE,WAAW,GAAG,IAAI;IAUnC;;;;;;OAMG;IACH,WAAW,CAAC,IAAI,GAAE,KAAK,EAAqB,GAAG,IAAI;IASnD;;;;OAIG;IACG,WAAW,IAAI,OAAO,CAAC,IAAI,CAAC;IAgBlC;;;;OAIG;IACH,WAAW,IAAI,IAAI;cAMH,WAAW,IAAI,OAAO,CAAC,IAAI,CAAC;CAK7C"}

package/out/controller/control/chart/chart.controller.js

@@ -1,5 +1,4 @@
 import { RuntimeError } from '@ibiz-template/core';
-import { clone } from 'ramda';
 import { ChartOptionsGenerator } from './generator/chart-options-generator';
 import { ChartService } from './chart.service';
 import { MDControlController } from '../../common';
@@ -52,14 +51,22 @@ export class ChartController extends MDControlController {
      * @memberof ChartController
      */
     changeTooltipState(tag = true) {
-        if (this.options && this.options.tooltip) {
+        if (this.chart && this.options && this.options.tooltip) {
             if (tag) {
-                Object.assign(this.options.tooltip, { show: this.tooltipState });
+                this.chart.setOption({
+                    tooltip: {
+                        show: this.tooltipState,
+                    },
+                }, { notMerge: false });
             }
             else {
-                Object.assign(this.options.tooltip, { show: false });
+                this.chart.setOption({
+                    tooltip: {
+                        show: false,
+                    },
+                }, { notMerge: false });
             }
-            this.updateChart();
+            this.resizeChart();
         }
     }
     /**
@@ -72,12 +79,24 @@ export class ChartController extends MDControlController {
         var _a;
         const { data, seriesType } = arg;
         let tempConfig = {};
-        if (seriesType === 'pie') {
-            // 饼图
+        if (seriesType === 'pie' || seriesType === 'gauge') {
+            // 饼图、仪表盘
             if (data && data.value && Array.isArray(data.value)) {
                 tempConfig = data.value.at(1);
             }
         }
+        else if (seriesType === 'radar') {
+            // 雷达图
+            const { componentIndex, componentSubType, componentType, event } = arg;
+            const index = event.topTarget.__dimIdx;
+            // 点击区域的时候抛出的值里面没有__dimIdx，此时不返回系列模型
+            if (componentType === 'series' && (index || index === 0)) {
+                const serieid = `${componentSubType}_${componentIndex}`;
+                tempConfig = {
+                    _seriesModelId: serieid,
+                };
+            }
+        }
         else if (data && Array.isArray(data)) {
             // 其他图
             tempConfig = data.at(2);
@@ -89,37 +108,48 @@ export class ChartController extends MDControlController {
         return targetSerie;
     }
     /**
-     * 处理查看明细参数
+     * 计算查看明细参数
      *
      * @param {IData} arg
      * @return {*}
      * @memberof ChartController
      */
     computedDrillDetailParam(arg) {
-        var _a;
-        const { seriesType, data } = arg;
+        var _a, _b;
+        const { seriesType } = arg;
         const targetSerie = this.computedClickSerieModel(arg);
         let measureId = '';
         const dimension = [];
         if (targetSerie) {
             measureId = targetSerie.valueField;
-            if (seriesType === 'pie') {
-                if (data && data.value && Array.isArray(data.value)) {
-                    const value = data.value.at(1);
-                    const tempData = clone(value.$origin);
-                    Object.keys(tempData).forEach((key) => {
-                        if (key !== targetSerie.valueField && key !== '$origin') {
+            if (seriesType === 'radar') {
+                // 雷达图特殊处理，因为不会直接返回点击项的name
+                const { event } = arg;
+                // 获取点击项的下标
+                const index = event.topTarget.__dimIdx;
+                // 获取当前分类的所有数据
+                const cataData = this.generator.radarMap.get(targetSerie.catalogField);
+                if (cataData && cataData.indicatorKeys) {
+                    // 获取点击的点所属的分类
+                    const cataValue = cataData.indicatorKeys[index];
+                    // 根据文本去构建的分类Map中获取对应的序列标识和分类的值
+                    const tempDimension = (_a = this.generator.seriesGenerators) === null || _a === void 0 ? void 0 : _a[0].catalogMap.get(cataValue);
+                    if (tempDimension) {
+                        // 计算维度数据
+                        Object.keys(tempDimension).forEach((key) => {
                             dimension.push({
                                 name: key,
-                                value: tempData[key],
+                                value: tempDimension[key],
                             });
-                        }
-                    });
+                        });
+                    }
                 }
             }
-            else {
+            else if (seriesType !== 'gauge') {
+                // 仪表盘无维度，其他图表统一处理
                 const value = arg.name;
-                const tempDimension = (_a = this.generator.seriesGenerators) === null || _a === void 0 ? void 0 : _a[0].catalogMap.get(value);
+                // 直接根据name去分类Map中获取对应的序列标识和分类的值
+                const tempDimension = (_b = this.generator.seriesGenerators) === null || _b === void 0 ? void 0 : _b[0].catalogMap.get(value);
                 if (tempDimension) {
                     Object.keys(tempDimension).forEach((key) => {
                         dimension.push({
@@ -134,7 +164,7 @@ export class ChartController extends MDControlController {
             measure: {
                 name: measureId,
             },
-            dimension,
+            dimension: dimension.length > 0 ? dimension : undefined,
         };
     }
     /**

package/out/controller/control/chart/generator/base-series-generator.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"base-series-generator.d.ts","sourceRoot":"","sources":["../../../../../src/controller/control/chart/generator/base-series-generator.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"base-series-generator.d.ts","sourceRoot":"","sources":["../../../../../src/controller/control/chart/generator/base-series-generator.ts"],"names":[],"mappings":"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"}

package/out/controller/control/chart/generator/base-series-generator.js

@@ -206,6 +206,7 @@ export class BaseSeriesGenerator {
         let tempItems = [];
         if (prevItems.length === 0) {
             tempItems = nextItems.codelist.map((item) => {
+                // 设置当前分类层级对应的文本和值
                 this.catalogMap.set(item.text, { [nextItems.codename]: item.value });
                 return {
                     codename: {
@@ -220,6 +221,8 @@ export class BaseSeriesGenerator {
             for (let prev = 0; prev < prevItems.length; prev++) {
                 if (nextItems.codelist.length > 0) {
                     for (let next = 0; next < nextItems.codelist.length; next++) {
+                        // 设置当前分类层级对应的文本和值，文本会拼接上一层级的文本，
+                        // 对应的值则是一个对象{ id:value}，里面存放第一层到现在这一层的每一层的标识与值
                         this.catalogMap.set(`${prevItems[prev].text}_${nextItems.codelist[next].text}`, Object.assign(Object.assign({}, prevItems[prev].codename), { [nextItems.codename]: nextItems.codelist[next].value }));
                         tempItems.push({
                             codename: Object.assign(Object.assign({}, prevItems[prev].codename), { [nextItems.codename]: nextItems.codelist[next].value }),
@@ -255,6 +258,7 @@ export class BaseSeriesGenerator {
         // 分组属性代码表和分类属性代码表
         const { seriesCodeListId, catalogCodeListId } = this.model;
         data.forEach(item => {
+            var _a, _b;
             // 计算分组名称标识
             let group = DEFAULT_GROUP;
             if (this.groupField) {
@@ -272,17 +276,28 @@ export class BaseSeriesGenerator {
                     // 多个分类，构建分层结构
                     let tempCodes = [];
                     const tempCodeLists = [];
+                    // 遍历分类数据，即多个维度
                     this.catalogFields.forEach((catalog) => {
                         const { codelistId, codename, mode } = catalog;
                         if (codelistId && this.autoCompleteCategory) {
+                            // 如果分类有代码表，保存起来，最终要计算分层情况下最后一层有多少数据，以及每一项数据对应了各个分层的值
                             const codeListItems = this.chartGenerator.codeListMap.get(codelistId);
                             tempCodeLists.push({ codename, codelist: clone(codeListItems) });
                         }
                         else if (mode === 'field') {
+                            // 如果不是代码表，那就是属性项，根据data手动构建一个数组
                             const tempdata = data.map((_data) => {
+                                var _a, _b;
+                                let tempValue;
+                                if ((_a = _data.$origin) === null || _a === void 0 ? void 0 : _a.$origin) {
+                                    tempValue = _data.$origin.$origin[codename];
+                                }
+                                else {
+                                    tempValue = (_b = _data.$origin) === null || _b === void 0 ? void 0 : _b[codename];
+                                }
                                 return {
                                     text: _data[codename],
-                                    value: _data[codename],
+                                    value: tempValue,
                                 };
                             });
                             tempCodeLists.push({ codename, codelist: tempdata });
@@ -305,6 +320,8 @@ export class BaseSeriesGenerator {
                     const codeListItems = this.chartGenerator.codeListMap.get(catalogCodeListId);
                     codeListItems.forEach(x => {
                         groupData[group].set(x.text, { value: 0 });
+                        // 没有分层数据，但是有代码表的情况就直接记录分类属性与代码表项的值
+                        this.catalogMap.set(x.text, { [this.catalogField]: x.value });
                         // 分组数据默认封装chartData，此时值定死为0
                         this.prepareChartData(groupData, {
                             [this.valueField]: 0,
@@ -337,6 +354,19 @@ export class BaseSeriesGenerator {
             if (!catalog) {
                 return;
             }
+            if (!catalogCodeListId) {
+                // 类似雷达图，有维度项，却不是横纵坐标轴,没有分类数组，但是当前数据有分类属性，这里直接记录当前分类属性值对应的数据
+                let tempValue;
+                if ((_a = item.$origin) === null || _a === void 0 ? void 0 : _a.$origin) {
+                    tempValue = item.$origin.$origin[this.catalogField];
+                }
+                else {
+                    tempValue = (_b = item.$origin) === null || _b === void 0 ? void 0 : _b[this.catalogField];
+                }
+                this.catalogMap.set(item[this.catalogField], {
+                    [this.catalogField]: tempValue,
+                });
+            }
             // 该分类属性对应的单条数据不存在时新建一个
             if (!groupData[group].get(catalog)) {
                 groupData[group].set(catalog, { value: 0 });
@@ -364,7 +394,7 @@ export class BaseSeriesGenerator {
      * @return {*}  {SeriesOption[]}
      */
     calcGroupSeries(groupData) {
-        return Object.keys(groupData).map(group => {
+        const tempSeries = Object.keys(groupData).map(group => {
             // 处理每个序列的数据
             const catalogData = groupData[group];
             const data = this.calcSeriesData(catalogData);
@@ -385,6 +415,21 @@ export class BaseSeriesGenerator {
             }
             return options;
         });
+        if (this.model.seriesCodeListId) {
+            const codelist = this.chartGenerator.codeListMap.get(this.model.seriesCodeListId);
+            if (codelist) {
+                tempSeries.sort((a, b) => {
+                    const aIndex = codelist.findIndex((_code) => {
+                        return _code.text === a.name;
+                    });
+                    const bIndex = codelist.findIndex((_code) => {
+                        return _code.text === b.name;
+                    });
+                    return aIndex - bIndex;
+                });
+            }
+        }
+        return tempSeries;
     }
     /**
      * 生成每条序列的data,由于不同图表类型格式不同所以为any

package/out/controller/control/chart/generator/chart-options-generator.js

@@ -366,10 +366,10 @@ export class ChartOptionsGenerator {
         if (controlParam && ((_a = controlParam.ctrlParams) === null || _a === void 0 ? void 0 : _a.ZONE)) {
             const length = (_b = this.model.dechartSerieses) === null || _b === void 0 ? void 0 : _b.length;
             if (length) {
-                const height = 90 / length;
+                const height = 85 / length;
                 const items = [];
                 for (let i = 0; i < length; i++) {
-                    const top = i * height + 5;
+                    const top = i * height + 10;
                     const bottom = 100 - (height + top);
                     items.push({
                         top: `${top}%`,
@@ -448,7 +448,7 @@ export class ChartOptionsGenerator {
                             if (codeListItems) {
                                 if (((_a = controlParam.ctrlParams) === null || _a === void 0 ? void 0 : _a.MODE) === 'ROW') {
                                     // 计算条形图时yAxis的配置以及图表的四周间隔
-                                    const yAxisData = this.handleAxisLayout(codeListItems, 40, tempCatalogFields.length, index);
+                                    const yAxisData = this.handleAxisLayout(codeListItems, 60, tempCatalogFields.length, index);
                                     // 开始计算每一层的标签刻度个数，并动态生成相应个数的配置数据
                                     const tempxAxisData = this.handleAxisLevel(tempaxis, index, yAxisData);
                                     tempaxis.push({
@@ -502,7 +502,7 @@ export class ChartOptionsGenerator {
                             }
                             else {
                                 Object.assign(this.chartUserParam.grid, {
-                                    left: (catalogLength + 1) * 40,
+                                    left: (catalogLength + 1) * 60,
                                 });
                             }
                             const tempyAxis = this.chartUserParam.yAxis;
@@ -524,7 +524,7 @@ export class ChartOptionsGenerator {
                                 data: [
                                     {
                                         value: mergeName.split('').join('\n'),
-                                        textStyle: Object.assign({ padding: [0, catalogLength * 40, 0, 0] }, nameTextStyle),
+                                        textStyle: Object.assign({ padding: [0, catalogLength * 50, 0, 0] }, nameTextStyle),
                                     },
                                 ],
                                 position: 'left',

package/out/controller/control/dashboard/portlet/portlet-part/portlet-part.controller.d.ts

@@ -75,6 +75,13 @@ export declare class PortletPartController<T extends IDBPortletPart = IDBPortlet
      * @memberof PortletPartController
      */
     get contentController(): IController | undefined;
+    /**
+     * @description 内容元素
+     * @readonly
+     * @type {(HTMLDivElement | null)}
+     * @memberof PortletPartController
+     */
+    get contentElement(): HTMLDivElement | null;
     /**
      * Creates an instance of PortletPartController.
      * @author lxm

package/out/controller/control/dashboard/portlet/portlet-part/portlet-part.controller.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"portlet-part.controller.d.ts","sourceRoot":"","sources":["../../../../../../src/controller/control/dashboard/portlet/portlet-part/portlet-part.controller.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,cAAc,EAAE,oBAAoB,EAAE,MAAM,kBAAkB,CAAC;AAGxE,OAAO,EACL,kBAAkB,EAClB,oBAAoB,EACpB,2BAA2B,EAC3B,eAAe,EACf,WAAW,EAEZ,MAAM,0BAA0B,CAAC;AAKlC,OAAO,EAAE,gBAAgB,EAAE,MAAM,sBAAsB,CAAC;AAGxD;;;;;;;;GAQG;AACH,qBAAa,qBAAqB,CAAC,CAAC,SAAS,cAAc,GAAG,cAAc,CAC1E,YAAW,kBAAkB;IAE7B,QAAQ,CAAC,KAAK,EAAE,CAAC,CAAC;IAElB;;;;;OAKG;IACH,KAAK,EAAE,gBAAgB,CAAC;IAExB;;;;;;OAMG;IACH,QAAQ,CAAC,SAAS,EAAE,oBAAoB,CAAC;IAEzC;;;;;;OAMG;IACH,QAAQ,CAAC,MAAM,CAAC,EAAE,2BAA2B,CAAC;IAE9C;;;;;;;OAOG;IACH,IAAI,OAAO,IAAI,QAAQ,CAEtB;IAED;;;;;;OAMG;IACI,MAAM,EAAE,OAAO,CAAC;IAEvB;;;;;OAKG;IACI,MAAM,EAAE,KAAK,CAAM;IAE1B;;;;;;OAMG;IACH,IAAI,cAAc,IAAI,MAAM,EAAE,CAE7B;IAED;;;;;;OAMG;IACH,IAAI,iBAAiB,IAAI,WAAW,GAAG,SAAS,CAK/C;IAED;;;;;;;OAOG;gBAED,KAAK,EAAE,CAAC,EACR,SAAS,EAAE,oBAAoB,EAC/B,MAAM,CAAC,EAAE,2BAA2B;IAUtC;;;;;;OAMG;IACG,IAAI,IAAI,OAAO,CAAC,IAAI,CAAC;cAIX,MAAM,IAAI,OAAO,CAAC,IAAI,CAAC;IA8BvC;;;;;;OAMG;IACH,SAAS,CAAC,WAAW,IAAI,gBAAgB;IAIzC;;;;;OAKG;IACH,OAAO,IAAI,IAAI;IAIf;;;;;OAKG;IACG,SAAS,CAAC,MAAM,EAAE,KAAK,GAAG,OAAO,CAAC,IAAI,CAAC;IAY7C;;;;OAIG;IACH,WAAW,IAAI,IAAI;IAcnB;;;;;;OAMG;IACH,YAAY,CAAC,KAAK,EAAE,eAAe,GAAG,IAAI;IAc1C;;;;;;OAMG;IACG,gBAAgB,IAAI,OAAO,CAAC,IAAI,CAAC;IA4BvC;;;;;;;OAOG;IACG,aAAa,CACjB,MAAM,EAAE,oBAAoB,EAC5B,KAAK,EAAE,UAAU,EACjB,IAAI,GAAE,KAAK,EAAO,GACjB,OAAO,CAAC,IAAI,CAAC;IAkChB;;;;;;OAMG;IACG,gBAAgB,CAAC,IAAI,EAAE,KAAK,GAAG,OAAO,CAAC,IAAI,CAAC;IAWlD;;;;;OAKG;IACH,SAAS,CAAC,aAAa,CAAC,IAAI,EAAE,KAAK,GAAG,IAAI;IAS1C;;;;OAIG;IACG,SAAS,IAAI,OAAO,CAAC,IAAI,CAAC;CAIjC"}
+{"version":3,"file":"portlet-part.controller.d.ts","sourceRoot":"","sources":["../../../../../../src/controller/control/dashboard/portlet/portlet-part/portlet-part.controller.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,cAAc,EAAE,oBAAoB,EAAE,MAAM,kBAAkB,CAAC;AAGxE,OAAO,EACL,kBAAkB,EAClB,oBAAoB,EACpB,2BAA2B,EAC3B,eAAe,EACf,WAAW,EAEZ,MAAM,0BAA0B,CAAC;AAKlC,OAAO,EAAE,gBAAgB,EAAE,MAAM,sBAAsB,CAAC;AAGxD;;;;;;;;GAQG;AACH,qBAAa,qBAAqB,CAAC,CAAC,SAAS,cAAc,GAAG,cAAc,CAC1E,YAAW,kBAAkB;IAE7B,QAAQ,CAAC,KAAK,EAAE,CAAC,CAAC;IAElB;;;;;OAKG;IACH,KAAK,EAAE,gBAAgB,CAAC;IAExB;;;;;;OAMG;IACH,QAAQ,CAAC,SAAS,EAAE,oBAAoB,CAAC;IAEzC;;;;;;OAMG;IACH,QAAQ,CAAC,MAAM,CAAC,EAAE,2BAA2B,CAAC;IAE9C;;;;;;;OAOG;IACH,IAAI,OAAO,IAAI,QAAQ,CAEtB;IAED;;;;;;OAMG;IACI,MAAM,EAAE,OAAO,CAAC;IAEvB;;;;;OAKG;IACI,MAAM,EAAE,KAAK,CAAM;IAE1B;;;;;;OAMG;IACH,IAAI,cAAc,IAAI,MAAM,EAAE,CAE7B;IAED;;;;;;OAMG;IACH,IAAI,iBAAiB,IAAI,WAAW,GAAG,SAAS,CAK/C;IAED;;;;;OAKG;IACH,IAAI,cAAc,IAAI,cAAc,GAAG,IAAI,CAS1C;IAED;;;;;;;OAOG;gBAED,KAAK,EAAE,CAAC,EACR,SAAS,EAAE,oBAAoB,EAC/B,MAAM,CAAC,EAAE,2BAA2B;IAUtC;;;;;;OAMG;IACG,IAAI,IAAI,OAAO,CAAC,IAAI,CAAC;cAIX,MAAM,IAAI,OAAO,CAAC,IAAI,CAAC;IA8BvC;;;;;;OAMG;IACH,SAAS,CAAC,WAAW,IAAI,gBAAgB;IAIzC;;;;;OAKG;IACH,OAAO,IAAI,IAAI;IAIf;;;;;OAKG;IACG,SAAS,CAAC,MAAM,EAAE,KAAK,GAAG,OAAO,CAAC,IAAI,CAAC;IAY7C;;;;OAIG;IACH,WAAW,IAAI,IAAI;IAcnB;;;;;;OAMG;IACH,YAAY,CAAC,KAAK,EAAE,eAAe,GAAG,IAAI;IAc1C;;;;;;OAMG;IACG,gBAAgB,IAAI,OAAO,CAAC,IAAI,CAAC;IA4BvC;;;;;;;OAOG;IACG,aAAa,CACjB,MAAM,EAAE,oBAAoB,EAC5B,KAAK,EAAE,UAAU,EACjB,IAAI,GAAE,KAAK,EAAO,GACjB,OAAO,CAAC,IAAI,CAAC;IAkChB;;;;;;OAMG;IACG,gBAAgB,CAAC,IAAI,EAAE,KAAK,GAAG,OAAO,CAAC,IAAI,CAAC;IAWlD;;;;;OAKG;IACH,SAAS,CAAC,aAAa,CAAC,IAAI,EAAE,KAAK,GAAG,IAAI;IAS1C;;;;OAIG;IACG,SAAS,IAAI,OAAO,CAAC,IAAI,CAAC;CAIjC"}

package/out/controller/control/dashboard/portlet/portlet-part/portlet-part.controller.js

@@ -1,5 +1,5 @@
 import { merge } from 'lodash-es';
-import { IBizContext, IBizParams } from '@ibiz-template/core';
+import { IBizContext, IBizParams, Namespace } from '@ibiz-template/core';
 import { calcLayoutHeightWidth, calcDynaClass } from '../../../../../model';
 import { ControlVO } from '../../../../../service';
 import { UIActionUtil } from '../../../../../ui-action';
@@ -50,6 +50,22 @@ export class PortletPartController {
             return this.dashboard.getController(contentControlId);
         }
     }
+    /**
+     * @description 内容元素
+     * @readonly
+     * @type {(HTMLDivElement | null)}
+     * @memberof PortletPartController
+     */
+    get contentElement() {
+        if (this.contentController) {
+            const { codeName = '' } = this.contentController.model;
+            if (codeName) {
+                const ns = new Namespace('control', ibiz.env.namespace);
+                return document.querySelector(`.${ns.m(codeName)}`);
+            }
+        }
+        return null;
+    }
     /**
      * Creates an instance of PortletPartController.
      * @author lxm

package/out/controller/control/dashboard/portlet/report-portlet/report-portlet.controller.d.ts

@@ -1,6 +1,16 @@
 import { IDBReportPortletPart } from '@ibiz/model-core';
 import { PortletPartController } from '../portlet-part/portlet-part.controller';
+import { IController } from '../../../../../interface';
 export declare class ReportPortletController extends PortletPartController<IDBReportPortletPart> {
+    /**
+     * 内容控制器
+     *
+     * @author tony001
+     * @date 2024-05-07 14:05:02
+     * @readonly
+     * @type {(IController | undefined)}
+     */
+    get contentController(): IController | undefined;
     /**
      * 刷新报表部件
      *

package/out/controller/control/dashboard/portlet/report-portlet/report-portlet.controller.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"report-portlet.controller.d.ts","sourceRoot":"","sources":["../../../../../../src/controller/control/dashboard/portlet/report-portlet/report-portlet.controller.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,oBAAoB,EAAE,MAAM,kBAAkB,CAAC;AACxD,OAAO,EAAE,qBAAqB,EAAE,MAAM,yCAAyC,CAAC;AAGhF,qBAAa,uBAAwB,SAAQ,qBAAqB,CAAC,oBAAoB,CAAC;IACtF;;;;;OAKG;IACH,OAAO,IAAI,IAAI;CAKhB"}
+{"version":3,"file":"report-portlet.controller.d.ts","sourceRoot":"","sources":["../../../../../../src/controller/control/dashboard/portlet/report-portlet/report-portlet.controller.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,oBAAoB,EAAE,MAAM,kBAAkB,CAAC;AACxD,OAAO,EAAE,qBAAqB,EAAE,MAAM,yCAAyC,CAAC;AAChF,OAAO,EAAE,WAAW,EAA0B,MAAM,0BAA0B,CAAC;AAE/E,qBAAa,uBAAwB,SAAQ,qBAAqB,CAAC,oBAAoB,CAAC;IACtF;;;;;;;OAOG;IACH,IAAI,iBAAiB,IAAI,WAAW,GAAG,SAAS,CAM/C;IAED;;;;;OAKG;IACH,OAAO,IAAI,IAAI;CAKhB"}

package/out/controller/control/dashboard/portlet/report-portlet/report-portlet.controller.js

@@ -1,5 +1,20 @@
 import { PortletPartController } from '../portlet-part/portlet-part.controller';
 export class ReportPortletController extends PortletPartController {
+    /**
+     * 内容控制器
+     *
+     * @author tony001
+     * @date 2024-05-07 14:05:02
+     * @readonly
+     * @type {(IController | undefined)}
+     */
+    get contentController() {
+        const { controls = [] } = this.model;
+        const reportPanel = controls.find(x => x.controlType === 'REPORTPANEL');
+        if (reportPanel && reportPanel.codeName) {
+            return this.dashboard.getController(reportPanel.codeName);
+        }
+    }
     /**
      * 刷新报表部件
      *

package/out/controller/control/dashboard/portlet/view-portlet/view-portlet.controller.d.ts

@@ -11,6 +11,13 @@ export declare class ViewPortletController extends PortletPartController<IDBView
      * @type {(IController | undefined)}
      */
     get contentController(): IController | undefined;
+    /**
+     * @description 内容元素
+     * @readonly
+     * @type {(HTMLDivElement | null)}
+     * @memberof PortletPartController
+     */
+    get contentElement(): HTMLDivElement | null;
     /**
      * 刷新门户部件
      *

package/out/controller/control/dashboard/portlet/view-portlet/view-portlet.controller.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"view-portlet.controller.d.ts","sourceRoot":"","sources":["../../../../../../src/controller/control/dashboard/portlet/view-portlet/view-portlet.controller.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,kBAAkB,EAAE,MAAM,kBAAkB,CAAC;AACtD,OAAO,EAAE,qBAAqB,EAAE,MAAM,yCAAyC,CAAC;AAGhF,OAAO,EAAE,WAAW,EAAE,MAAM,0BAA0B,CAAC;AAEvD,qBAAa,qBAAsB,SAAQ,qBAAqB,CAAC,kBAAkB,CAAC;IAClF;;;;;;;OAOG;IACH,IAAI,iBAAiB,IAAI,WAAW,GAAG,SAAS,CAK/C;IAED;;;;;OAKG;IACH,OAAO,IAAI,IAAI;CAOhB"}
+{"version":3,"file":"view-portlet.controller.d.ts","sourceRoot":"","sources":["../../../../../../src/controller/control/dashboard/portlet/view-portlet/view-portlet.controller.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,kBAAkB,EAAE,MAAM,kBAAkB,CAAC;AAEtD,OAAO,EAAE,qBAAqB,EAAE,MAAM,yCAAyC,CAAC;AAGhF,OAAO,EAAE,WAAW,EAAE,MAAM,0BAA0B,CAAC;AAEvD,qBAAa,qBAAsB,SAAQ,qBAAqB,CAAC,kBAAkB,CAAC;IAClF;;;;;;;OAOG;IACH,IAAI,iBAAiB,IAAI,WAAW,GAAG,SAAS,CAK/C;IAED;;;;;OAKG;IACH,IAAI,cAAc,IAAI,cAAc,GAAG,IAAI,CAS1C;IAED;;;;;OAKG;IACH,OAAO,IAAI,IAAI;CAOhB"}

package/out/controller/control/dashboard/portlet/view-portlet/view-portlet.controller.js

@@ -1,3 +1,4 @@
+import { Namespace } from '@ibiz-template/core';
 import { PortletPartController } from '../portlet-part/portlet-part.controller';
 import { SysUIActionTag } from '../../../../../constant';
 export class ViewPortletController extends PortletPartController {
@@ -15,6 +16,22 @@ export class ViewPortletController extends PortletPartController {
             return this.dashboard.getController(portletAppView.name);
         }
     }
+    /**
+     * @description 内容元素
+     * @readonly
+     * @type {(HTMLDivElement | null)}
+     * @memberof PortletPartController
+     */
+    get contentElement() {
+        if (this.contentController) {
+            const { codeName = '' } = this.contentController.model;
+            if (codeName) {
+                const ns = new Namespace('view', ibiz.env.namespace);
+                return document.querySelector(`.${ns.m(codeName)}`);
+            }
+        }
+        return null;
+    }
     /**
      * 刷新门户部件
      *

package/out/controller/control/grid/grid/entity-schema.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"entity-schema.d.ts","sourceRoot":"","sources":["../../../../../src/controller/control/grid/grid/entity-schema.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,eAAe,EAAE,kBAAkB,EAAE,MAAM,kBAAkB,CAAC;AACvE,OAAO,EAAE,cAAc,EAAE,MAAM,mBAAmB,CAAC;AASnD;;;;;;;;GAQG;AACH,wBAAsB,uBAAuB,CAC3C,IAAI,EAAE,KAAK,EACX,CAAC,EAAE,cAAc,GAChB,OAAO,CACN;IAAE,aAAa,EAAE,kBAAkB,EAAE,CAAC;IAAC,eAAe,EAAE,eAAe,EAAE,CAAA;CAAE,GAC3E,SAAS,CACZ,CAsFA"}
+{"version":3,"file":"entity-schema.d.ts","sourceRoot":"","sources":["../../../../../src/controller/control/grid/grid/entity-schema.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,eAAe,EAAE,kBAAkB,EAAE,MAAM,kBAAkB,CAAC;AACvE,OAAO,EAAE,cAAc,EAAE,MAAM,mBAAmB,CAAC;AASnD;;;;;;;;GAQG;AACH,wBAAsB,uBAAuB,CAC3C,IAAI,EAAE,KAAK,EACX,CAAC,EAAE,cAAc,GAChB,OAAO,CACN;IAAE,aAAa,EAAE,kBAAkB,EAAE,CAAC;IAAC,eAAe,EAAE,eAAe,EAAE,CAAA;CAAE,GAC3E,SAAS,CACZ,CA0FA"}

package/out/controller/control/grid/grid/entity-schema.js

@@ -60,6 +60,9 @@ export async function calcColumnModelBySchema(json, c) {
     });
     const addColumns = [];
     const addDataItems = [];
+    addFields.sort((a, b) => {
+        return (a.description || '').localeCompare(b.description || '');
+    });
     addFields.forEach(item => {
         addColumns.push({
             appId: c.model.appId,

package/out/controller/control/search-bar/entity-schema.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"entity-schema.d.ts","sourceRoot":"","sources":["../../../../src/controller/control/search-bar/entity-schema.ts"],"names":[],"mappings":"AAAA,OAAO,EAA0B,gBAAgB,EAAE,MAAM,kBAAkB,CAAC;AAkH5E;;;;;;;;GAQG;AACH,wBAAsB,uBAAuB,CAC3C,IAAI,EAAE,KAAK,EACX,eAAe,EAAE,MAAM,EACvB,UAAU,EAAE,MAAM,GACjB,OAAO,CAAC,gBAAgB,EAAE,CAAC,CAoF7B"}
+{"version":3,"file":"entity-schema.d.ts","sourceRoot":"","sources":["../../../../src/controller/control/search-bar/entity-schema.ts"],"names":[],"mappings":"AAAA,OAAO,EAA0B,gBAAgB,EAAE,MAAM,kBAAkB,CAAC;AAkH5E;;;;;;;;GAQG;AACH,wBAAsB,uBAAuB,CAC3C,IAAI,EAAE,KAAK,EACX,eAAe,EAAE,MAAM,EACvB,UAAU,EAAE,MAAM,GACjB,OAAO,CAAC,gBAAgB,EAAE,CAAC,CAwF7B"}

package/out/controller/control/search-bar/entity-schema.js

@@ -146,6 +146,9 @@ export async function calcFilterModelBySchema(json, appDataEntityId, modelAppId)
         }
     });
     const addSearchBarFilters = [];
+    addFields.sort((a, b) => {
+        return (a.description || '').localeCompare(b.description || '');
+    });
     addFields.forEach(item => {
         const ops = typeToOPs[item.type];
         if (!ops) {

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

@@ -1,5 +1,5 @@
 import { IAppDataEntity, ISearchBar, ISearchBarFilter } from '@ibiz/model-core';
-import { ISearchBarState, ISearchBarEvent, ISearchBarController, IBackendSearchBarGroup, IGridController } from '../../../interface';
+import { ISearchBarState, ISearchBarEvent, ISearchBarController, IBackendSearchBarGroup, IGridController, IFilterNode } from '../../../interface';
 import { ControlController } from '../../common';
 import { SearchBarFilterController } from './search-bar-filter.controller';
 import { SearchBarService } from './search-bar.service';
@@ -182,6 +182,15 @@ export declare class SearchBarController extends ControlController<ISearchBar, I
      * @return {*}  {Promise<void>}
      */
     protected initSearchBarFilters(): Promise<void>;
+    /**
+     * 附加自定义条件
+     *
+     * @author zhanghengfeng
+     * @date 2024-07-19 10:07:34
+     * @param {IFilterNode[]} nodes
+     * @return {*}  {void}
+     */
+    attachCustomCond(nodes: IFilterNode[]): void;
     /**
      * 计算过滤项参数
      * @author lxm

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

@@ -1 +1 @@
-{"version":3,"file":"search-bar.controller.d.ts","sourceRoot":"","sources":["../../../../src/controller/control/search-bar/search-bar.controller.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,cAAc,EAAE,UAAU,EAAE,gBAAgB,EAAE,MAAM,kBAAkB,CAAC;AAGhF,OAAO,EACL,eAAe,EACf,eAAe,EACf,oBAAoB,EACpB,sBAAsB,EACtB,eAAe,EAIhB,MAAM,oBAAoB,CAAC;AAE5B,OAAO,EAAE,iBAAiB,EAAE,MAAM,cAAc,CAAC;AACjD,OAAO,EAAE,yBAAyB,EAAE,MAAM,gCAAgC,CAAC;AAC3E,OAAO,EAAE,gBAAgB,EAAE,MAAM,sBAAsB,CAAC;AAgBxD;;;;;;;;GAQG;AACH,qBAAa,mBACX,SAAQ,iBAAiB,CAAC,UAAU,EAAE,eAAe,EAAE,eAAe,CACtE,YAAW,oBAAoB;IAE/B;;;;;OAKG;IACH,WAAW,SAAM;IAEjB;;;;;OAKG;IACH,iBAAiB,EAAE,yBAAyB,EAAE,CAAM;IAEpD;;;;;OAKG;IACH,OAAO,EAAG,gBAAgB,CAAC;IAE3B;;;;;OAKG;IACH,gBAAgB,EAAE,sBAAsB,GAAG,IAAI,CAAQ;IAEvD;;;;;OAKG;IACH,oBAAoB,UAA8C;IAElE;;;;;OAKG;IACH,gBAAgB,UAAS;IAEzB;;;;;OAKG;IACH,IAAI,YAAY,IAAI,OAAO,CAE1B;IAED;;;;;OAKG;IACH,IAAI,gBAAgB,IAAI,gBAAgB,EAAE,CAEzC;IAED;;;;OAIG;IACH,gBAAgB,UAAS;IAEzB;;;;;;OAMG;IACH,gBAAgB,EAAE,OAAO,CAAM;IAE/B;;;;;OAKG;IACH,IAAI,IAAI,IAAI,eAAe,GAAG,SAAS,CAGtC;IAED;;;;;OAKG;IACH,aAAa,EAAG,cAAc,CAAC;IAE/B;;;;;;OAMG;IACH,aAAa,EAAE,OAAO,CAAS;IAE/B;;;;;OAKG;IACH,YAAY,CAAC,EAAE,MAAM,MAAM,GAAG,SAAS,CAAC;IAExC;;;;;;OAMG;IACH,eAAe,CAAC,EAAE,EAAE,MAAM,MAAM,GAAG,SAAS,GAAG,IAAI;IAInD,SAAS,CAAC,SAAS,IAAI,IAAI;cAkBX,SAAS,IAAI,OAAO,CAAC,IAAI,CAAC;IAqC1C;;;;;OAKG;IACG,kBAAkB,IAAI,OAAO,CAAC,IAAI,CAAC;IA2CzC;;;;;;OAMG;IACH,SAAS,CAAC,0BAA0B,IAAI,IAAI;IA4B5C;;;;;;OAMG;IACH,WAAW,CAAC,GAAG,EAAE,MAAM,GAAG,IAAI;IAI9B;;;;;OAKG;IACH,QAAQ,IAAI,IAAI;IAIhB;;;;;;;OAOG;IACH,oBAAoB,CAClB,SAAS,EAAE,MAAM,GAAG,IAAI,EACxB,OAAO,EAAE,MAAM,GAAG,IAAI,GACrB,yBAAyB,GAAG,SAAS;IAUxC;;;;;OAKG;IACH,eAAe,IAAI,OAAO;IAsC1B;;;;OAIG;IACH,WAAW,IAAI,IAAI;IAKnB;;;;;;OAMG;cACa,oBAAoB,IAAI,OAAO,CAAC,IAAI,CAAC;IA0DrD;;;;;OAKG;IACH,WAAW,IAAI,KAAK,EAAE,GAAG,SAAS;IAsBlC;;;;;OAKG;IACG,iBAAiB,CAAC,SAAS,GAAE,OAAe,GAAG,OAAO,CAAC,IAAI,CAAC;IAyHlE;;;;;OAKG;IACH,gBAAgB,IAAI,IAAI;IA0BxB;;;;;OAKG;IACG,UAAU,IAAI,OAAO,CAAC,IAAI,CAAC;IA2CjC;;;;;OAKG;IACG,gBAAgB,CAAC,SAAS,EAAE,sBAAsB,GAAG,OAAO,CAAC,IAAI,CAAC;IAkDxE;;;;;OAKG;IACH,SAAS,CAAC,uBAAuB,IAAI,IAAI;IAsBzC;;;;OAIG;IACH,0BAA0B,IAAI,IAAI;CAenC"}
+{"version":3,"file":"search-bar.controller.d.ts","sourceRoot":"","sources":["../../../../src/controller/control/search-bar/search-bar.controller.ts"],"names":[],"mappings":"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"}