@ibiz-template/runtime 0.7.24 → 0.7.25-alpha.1

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":"AACA,OAAO,EAEL,cAAc,EACf,MAAM,kBAAkB,CAAC;AAO1B,OAAO,KAAK,EAAE,cAAc,EAAE,YAAY,EAAE,MAAM,SAAS,CAAC;AAE5D,OAAO,EACL,qBAAqB,EAEtB,MAAM,2BAA2B,CAAC;AACnC,OAAO,EAAE,UAAU,EAAE,MAAM,uBAAuB,CAAC;AASnD,cAAc;AACd,MAAM,MAAM,UAAU,GAAG;IACvB;;OAEG;IACH,KAAK,EAAE,MAAM,CAAC;IAEd;;;;;OAKG;IACH,SAAS,CAAC,EAAE,UAAU,CAAC;CACxB,CAAC;AACF,sBAAsB;AACtB,MAAM,MAAM,WAAW,GAAG,GAAG,CAAC,MAAM,EAAE,UAAU,CAAC,CAAC;AAElD,sBAAsB;AACtB,MAAM,MAAM,SAAS,GAAG,MAAM,CAAC,MAAM,EAAE,WAAW,CAAC,CAAC;AAEpD,eAAO,MAAM,aAAa,mBAAmB,CAAC;AAE9C,qBAAa,mBAAmB,CAAC,CAAC,SAAS,cAAc,GAAG,cAAc;IAiG/D,KAAK,EAAE,CAAC;IACf,SAAS,CAAC,cAAc,EAAE,qBAAqB;IAjGjD;;;;;OAKG;IACH,YAAY,EAAE,MAAM,CAAC;IAErB;;;;;OAKG;IACH,UAAU,EAAE,MAAM,CAAC;IAEnB;;;;;OAKG;IACH,UAAU,CAAC,EAAE,MAAM,CAAC;IAEpB;;;;;OAKG;IACH,UAAU,CAAC,EAAE,MAAM,CAAC;IAEpB;;;;;OAKG;IACH,UAAU,CAAC,EAAE,MAAM,CAAC;IAEpB;;;;;OAKG;IACH,UAAU,EAAE,MAAM,CAAC;IAEnB;;;;;OAKG;IACH,SAAS,CAAC,EAAE,SAAS,CAAC;IAEtB;;;;;OAKG;IACH,YAAY,EAAE,UAAU,EAAE,CAAM;IAEhC;;;;;OAKG;IACH,aAAa,EAAE,YAAY,CAAM;IAEjC;;;;;OAKG;IACH,eAAe,CAAC,EAAE,YAAY,CAAC;IAE/B;;;;;OAKG;IACH,oBAAoB,EAAE,OAAO,CAAQ;IAErC;;;;;;OAMG;gBAEM,KAAK,EAAE,CAAC,EACL,cAAc,EAAE,qBAAqB;IAqCjD;;;;OAIG;IACH,SAAS,CAAC,iBAAiB,IAAI,YAAY;IAmB3C;;;;;;;;;;;OAWG;IACH,YAAY,CACV,WAAW,EAAE,MAAM,GAAG,SAAS,EAC/B,GAAG,EAAE,MAAM,GAAG,SAAS,EACvB,SAAS,GAAE,OAAe,GACzB,MAAM,GAAG,SAAS;IAkBrB;;;;;OAKG;IACH,SAAS,CAAC,gBAAgB,CACxB,SAAS,EAAE,SAAS,EACpB,MAAM,EAAE,KAAK,EACb,OAAO,EAAE,MAAM,EACf,KAAK,EAAE,MAAM,GACZ,IAAI;IAcP;;;;;;OAMG;IACH,SAAS,CAAC,aAAa,CAAC,IAAI,EAAE,KAAK,EAAE,GAAG,SAAS;IAqFjD;;;;;;;OAOG;IACH,SAAS,CAAC,eAAe,CAAC,SAAS,EAAE,SAAS,GAAG,YAAY,EAAE;IAuB/D;;;;;;;OAOG;IAEH,SAAS,CAAC,cAAc,CAAC,WAAW,EAAE,WAAW,GAAG,GAAG;IAQvD;;;;;;OAMG;IACH,UAAU,CAAC,IAAI,EAAE,KAAK,EAAE,GAAG,YAAY,EAAE,GAAG,YAAY;IAOxD;;;;;;OAMG;IACH,oBAAoB,CAAC,MAAM,EAAE,cAAc,GAAG,KAAK,GAAG,SAAS;IAO/D;;;;;OAKG;IACH,cAAc,CAAC,IAAI,EAAE,KAAK,EAAE,GAAG,KAAK,EAAE;IAmDtC;;;;;;OAMG;IACH,YAAY,CAAC,IAAI,EAAE,SAAS,GAAG,IAAI;IA+BnC;;;;;;OAMG;IACH,WAAW,CAAC,IAAI,EAAE,SAAS,GAAG,IAAI;CAgInC"}
+{"version":3,"file":"base-series-generator.d.ts","sourceRoot":"","sources":["../../../../../src/controller/control/chart/generator/base-series-generator.ts"],"names":[],"mappings":"AACA,OAAO,EAEL,cAAc,EACf,MAAM,kBAAkB,CAAC;AAO1B,OAAO,KAAK,EAAE,cAAc,EAAE,YAAY,EAAE,MAAM,SAAS,CAAC;AAE5D,OAAO,EACL,qBAAqB,EAEtB,MAAM,2BAA2B,CAAC;AACnC,OAAO,EAAE,UAAU,EAAE,MAAM,uBAAuB,CAAC;AASnD,cAAc;AACd,MAAM,MAAM,UAAU,GAAG;IACvB;;OAEG;IACH,KAAK,EAAE,MAAM,CAAC;IAEd;;;;;OAKG;IACH,SAAS,CAAC,EAAE,UAAU,CAAC;CACxB,CAAC;AACF,sBAAsB;AACtB,MAAM,MAAM,WAAW,GAAG,GAAG,CAAC,MAAM,EAAE,UAAU,CAAC,CAAC;AAElD,sBAAsB;AACtB,MAAM,MAAM,SAAS,GAAG,MAAM,CAAC,MAAM,EAAE,WAAW,CAAC,CAAC;AAEpD,eAAO,MAAM,aAAa,mBAAmB,CAAC;AAE9C,qBAAa,mBAAmB,CAAC,CAAC,SAAS,cAAc,GAAG,cAAc;IAiG/D,KAAK,EAAE,CAAC;IACf,SAAS,CAAC,cAAc,EAAE,qBAAqB;IAjGjD;;;;;OAKG;IACH,YAAY,EAAE,MAAM,CAAC;IAErB;;;;;OAKG;IACH,UAAU,EAAE,MAAM,CAAC;IAEnB;;;;;OAKG;IACH,UAAU,CAAC,EAAE,MAAM,CAAC;IAEpB;;;;;OAKG;IACH,UAAU,CAAC,EAAE,MAAM,CAAC;IAEpB;;;;;OAKG;IACH,UAAU,CAAC,EAAE,MAAM,CAAC;IAEpB;;;;;OAKG;IACH,UAAU,EAAE,MAAM,CAAC;IAEnB;;;;;OAKG;IACH,SAAS,CAAC,EAAE,SAAS,CAAC;IAEtB;;;;;OAKG;IACH,YAAY,EAAE,UAAU,EAAE,CAAM;IAEhC;;;;;OAKG;IACH,aAAa,EAAE,YAAY,CAAM;IAEjC;;;;;OAKG;IACH,eAAe,CAAC,EAAE,YAAY,CAAC;IAE/B;;;;;OAKG;IACH,oBAAoB,EAAE,OAAO,CAAQ;IAErC;;;;;;OAMG;gBAEM,KAAK,EAAE,CAAC,EACL,cAAc,EAAE,qBAAqB;IAqCjD;;;;OAIG;IACH,SAAS,CAAC,iBAAiB,IAAI,YAAY;IAmB3C;;;;;;;;;;;OAWG;IACH,YAAY,CACV,WAAW,EAAE,MAAM,GAAG,SAAS,EAC/B,GAAG,EAAE,MAAM,GAAG,SAAS,EACvB,SAAS,GAAE,OAAe,GACzB,MAAM,GAAG,SAAS;IAkBrB;;;;;OAKG;IACH,SAAS,CAAC,gBAAgB,CACxB,SAAS,EAAE,SAAS,EACpB,MAAM,EAAE,KAAK,EACb,OAAO,EAAE,MAAM,EACf,KAAK,EAAE,MAAM,GACZ,IAAI;IAcP;;;;;;OAMG;IACH,SAAS,CAAC,aAAa,CAAC,IAAI,EAAE,KAAK,EAAE,GAAG,SAAS;IAqFjD;;;;;;;OAOG;IACH,SAAS,CAAC,eAAe,CAAC,SAAS,EAAE,SAAS,GAAG,YAAY,EAAE;IAuB/D;;;;;;;OAOG;IAEH,SAAS,CAAC,cAAc,CAAC,WAAW,EAAE,WAAW,GAAG,GAAG;IAevD;;;;;;OAMG;IACH,UAAU,CAAC,IAAI,EAAE,KAAK,EAAE,GAAG,YAAY,EAAE,GAAG,YAAY;IAOxD;;;;;;OAMG;IACH,oBAAoB,CAAC,MAAM,EAAE,cAAc,GAAG,KAAK,GAAG,SAAS;IAO/D;;;;;OAKG;IACH,cAAc,CAAC,IAAI,EAAE,KAAK,EAAE,GAAG,KAAK,EAAE;IAmDtC;;;;;;OAMG;IACH,YAAY,CAAC,IAAI,EAAE,SAAS,GAAG,IAAI;IA+BnC;;;;;;OAMG;IACH,WAAW,CAAC,IAAI,EAAE,SAAS,GAAG,IAAI;CAgInC"}

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

@@ -244,7 +244,14 @@ export class BaseSeriesGenerator {
     calcSeriesData(catalogData) {
         const temData = [];
         catalogData.forEach((catalog, key) => {
-            temData.push([key, catalog.value, catalog.chartData]);
+            var _a;
+            if (this.chartGenerator.model.controlParam &&
+                ((_a = this.chartGenerator.model.controlParam.ctrlParams) === null || _a === void 0 ? void 0 : _a.MODE) === 'ROW') {
+                temData.push([catalog.value, key, catalog.chartData]);
+            }
+            else {
+                temData.push([key, catalog.value, catalog.chartData]);
+            }
         });
         return temData;
     }

package/out/controller/control/chart/generator/chart-options-generator.d.ts

@@ -13,7 +13,7 @@ import { CodeListItem } from '../../../../interface';
  */
 export declare function parseUserParams(userParams: Record<string, string>): IData;
 export declare class ChartOptionsGenerator {
-    private model;
+    model: IDEChart;
     /**
      * 实体模型
      * @author lxm

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

@@ -1 +1 @@
-{"version":3,"file":"chart-options-generator.d.ts","sourceRoot":"","sources":["../../../../../src/controller/control/chart/generator/chart-options-generator.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EACV,aAAa,EAEb,oBAAoB,EACpB,oBAAoB,EACpB,cAAc,EAEf,MAAM,SAAS,CAAC;AACjB,OAAO,EACL,cAAc,EACd,WAAW,EACX,WAAW,EACX,QAAQ,EACR,cAAc,EACd,aAAa,EACd,MAAM,kBAAkB,CAAC;AAI1B,OAAO,EAAE,mBAAmB,EAAE,MAAM,yBAAyB,CAAC;AAM9D,OAAO,EAAE,gBAAgB,EAAE,MAAM,sBAAsB,CAAC;AAExD,OAAO,EAAE,YAAY,EAAE,MAAM,uBAAuB,CAAC;AA2BrD;;;;;;;GAOG;AACH,wBAAgB,eAAe,CAAC,UAAU,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,GAAG,KAAK,CAmBzE;AAED,qBAAa,qBAAqB;IAoEpB,OAAO,CAAC,KAAK;IAnEzB;;;;;OAKG;IACH,MAAM,EAAG,cAAc,CAAC;IAExB;;;;;OAKG;IACH,aAAa,EAAE,aAAa,CAI1B;IAEF;;;;;OAKG;IACH,OAAO,EAAE,aAAa,CAAM;IAE5B;;;;;OAKG;IACH,cAAc,CAAC,EAAE,aAAa,CAAC;IAE/B;;;;;OAKG;IACH,gBAAgB,EAAE,mBAAmB,EAAE,CAAM;IAE7C;;;;;OAKG;IACH,QAAQ,gCAAuC;IAE/C;;;;OAIG;IACH,WAAW,EAAE,GAAG,CAAC,MAAM,EAAE,QAAQ,CAAC,YAAY,EAAE,CAAC,CAAC,CAAa;IAE/D;;;;;OAKG;IACH,uBAAuB,EAAE,GAAG,CAAC,MAAM,EAAE,mBAAmB,CAAC,CAAa;gBAElD,KAAK,EAAE,QAAQ;IAoCnC,SAAS,CAAC,oBAAoB,IAAI,IAAI;IAoCtC,SAAS,CAAC,eAAe,CAAC,UAAU,EAAE,aAAa,GAAG,aAAa,CAAC,OAAO,CAAC;IAmB5E,SAAS,CAAC,gBAAgB,CACxB,WAAW,EAAE,cAAc,GAC1B,aAAa,CAAC,QAAQ,CAAC;IAe1B,SAAS,CAAC,gBAAgB,CACxB,WAAW,EAAE,WAAW,EAAE,GAAG,WAAW,EAAE,GACzC,oBAAoB,EAAE,GAAG,oBAAoB,EAAE;IA2ClD;;;;;;;OAOG;IACG,IAAI,CAAC,OAAO,EAAE,QAAQ,EAAE,MAAM,EAAE,OAAO,GAAG,OAAO,CAAC,IAAI,CAAC;IAS7D;;;;;;OAMG;IACH,WAAW,CAAC,SAAS,EAAE,MAAM,GAAG,MAAM;IAKtC;;;;;;;;;OASG;IACG,YAAY,CAAC,OAAO,EAAE,QAAQ,EAAE,MAAM,EAAE,OAAO,GAAG,OAAO,CAAC,IAAI,CAAC;IAyBrE;;;;;;OAMG;IACH,iBAAiB,CAAC,IAAI,EAAE,KAAK,EAAE,GAAG,aAAa;IAoE/C;;;;;;OAMG;IACH,oBAAoB,CAAC,MAAM,EAAE,cAAc,GAAG,KAAK,GAAG,SAAS;CAkEhE"}
+{"version":3,"file":"chart-options-generator.d.ts","sourceRoot":"","sources":["../../../../../src/controller/control/chart/generator/chart-options-generator.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EACV,aAAa,EAEb,oBAAoB,EACpB,oBAAoB,EACpB,cAAc,EAEf,MAAM,SAAS,CAAC;AACjB,OAAO,EACL,cAAc,EACd,WAAW,EACX,WAAW,EACX,QAAQ,EACR,cAAc,EACd,aAAa,EACd,MAAM,kBAAkB,CAAC;AAI1B,OAAO,EAAE,mBAAmB,EAAE,MAAM,yBAAyB,CAAC;AAM9D,OAAO,EAAE,gBAAgB,EAAE,MAAM,sBAAsB,CAAC;AAExD,OAAO,EAAE,YAAY,EAAE,MAAM,uBAAuB,CAAC;AAmCrD;;;;;;;GAOG;AACH,wBAAgB,eAAe,CAAC,UAAU,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,GAAG,KAAK,CAmBzE;AAED,qBAAa,qBAAqB;IAoEb,KAAK,EAAE,QAAQ;IAnElC;;;;;OAKG;IACH,MAAM,EAAG,cAAc,CAAC;IAExB;;;;;OAKG;IACH,aAAa,EAAE,aAAa,CAI1B;IAEF;;;;;OAKG;IACH,OAAO,EAAE,aAAa,CAAM;IAE5B;;;;;OAKG;IACH,cAAc,CAAC,EAAE,aAAa,CAAC;IAE/B;;;;;OAKG;IACH,gBAAgB,EAAE,mBAAmB,EAAE,CAAM;IAE7C;;;;;OAKG;IACH,QAAQ,gCAAuC;IAE/C;;;;OAIG;IACH,WAAW,EAAE,GAAG,CAAC,MAAM,EAAE,QAAQ,CAAC,YAAY,EAAE,CAAC,CAAC,CAAa;IAE/D;;;;;OAKG;IACH,uBAAuB,EAAE,GAAG,CAAC,MAAM,EAAE,mBAAmB,CAAC,CAAa;gBAEnD,KAAK,EAAE,QAAQ;IAoClC,SAAS,CAAC,oBAAoB,IAAI,IAAI;IAoCtC,SAAS,CAAC,eAAe,CAAC,UAAU,EAAE,aAAa,GAAG,aAAa,CAAC,OAAO,CAAC;IAmB5E,SAAS,CAAC,gBAAgB,CACxB,WAAW,EAAE,cAAc,GAC1B,aAAa,CAAC,QAAQ,CAAC;IAe1B,SAAS,CAAC,gBAAgB,CACxB,WAAW,EAAE,WAAW,EAAE,GAAG,WAAW,EAAE,GACzC,oBAAoB,EAAE,GAAG,oBAAoB,EAAE;IA2ClD;;;;;;;OAOG;IACG,IAAI,CAAC,OAAO,EAAE,QAAQ,EAAE,MAAM,EAAE,OAAO,GAAG,OAAO,CAAC,IAAI,CAAC;IAS7D;;;;;;OAMG;IACH,WAAW,CAAC,SAAS,EAAE,MAAM,GAAG,MAAM;IAKtC;;;;;;;;;OASG;IACG,YAAY,CAAC,OAAO,EAAE,QAAQ,EAAE,MAAM,EAAE,OAAO,GAAG,OAAO,CAAC,IAAI,CAAC;IAyBrE;;;;;;OAMG;IACH,iBAAiB,CAAC,IAAI,EAAE,KAAK,EAAE,GAAG,aAAa;IAoE/C;;;;;;OAMG;IACH,oBAAoB,CAAC,MAAM,EAAE,cAAc,GAAG,KAAK,GAAG,SAAS;CAkEhE"}

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

@@ -26,6 +26,15 @@ const convertStringFunc = (option) => {
         else if (isObject(option[key])) {
             result[key] = convertStringFunc(option[key]);
         }
+        else if (Array.isArray(option[key])) {
+            // eslint-disable-next-line @typescript-eslint/no-explicit-any
+            result[key] = option[key].map((item) => {
+                if (typeof item !== 'object') {
+                    return item;
+                }
+                return convertStringFunc(item);
+            });
+        }
         else {
             result[key] = option[key];
         }

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;AAExD;;;;;;;;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;IAiBhB;;;;;;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;;;;;;;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

@@ -5,6 +5,7 @@ import { ControlVO } from '../../../../../service';
 import { UIActionUtil } from '../../../../../ui-action';
 import { ButtonContainerState, UIActionButtonState } from '../../../../utils';
 import { PortletPartState } from './portlet-part.state';
+import { SysUIActionTag } from '../../../../../constant';
 /**
  * 门户部件控制器基类
  *
@@ -215,15 +216,38 @@ export class PortletPartController {
      * @param {MouseEvent} event
      */
     async onActionClick(detail, event, data = []) {
+        var _a, _b;
         const actionId = detail.uiactionId;
-        await UIActionUtil.execAndResolved(actionId, {
+        const eventArgs = {
             context: this.context,
             params: this.params,
             data,
             view: this.dashboard.view,
             ctrl: this,
             event,
-        }, detail.appId);
+        };
+        const result = await UIActionUtil.exec(actionId, eventArgs, detail.appId);
+        if (result.closeView) {
+            this.dashboard.view.closeView();
+        }
+        else if (result.refresh) {
+            switch (result.refreshMode) {
+                // 刷新当前节点的子
+                case 1:
+                    this.refresh();
+                    break;
+                // 刷新当前节点的父节点的子
+                case 2:
+                    (_a = this.dashboard.view) === null || _a === void 0 ? void 0 : _a.callUIAction(SysUIActionTag.REFRESH);
+                    break;
+                // 刷新所有节点数据
+                case 3:
+                    (_b = this.dashboard.view
+                        .getTopView()) === null || _b === void 0 ? void 0 : _b.callUIAction(SysUIActionTag.REFRESH);
+                    break;
+                default:
+            }
+        }
     }
     /**
      * 表单数据变更通知(由表单控制器调用)

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

@@ -11,8 +11,8 @@ export class ViewPortletController extends PortletPartController {
      */
     get contentController() {
         const { portletAppView } = this.model;
-        if (portletAppView && portletAppView.codeName) {
-            return this.dashboard.getController(portletAppView.codeName);
+        if (portletAppView && portletAppView.name) {
+            return this.dashboard.getController(portletAppView.name);
         }
     }
     /**

package/out/controller/control/grid/grid-column/grid-field-column/grid-field-column.controller.js

@@ -289,7 +289,7 @@ export class GridFieldColumnController extends GridColumnController {
             return ValueExUtil.toText(this.model, value);
         }
         // 根据格式化配置格式化显示
-        const strVal = `${value}`;
+        const strVal = `${value || ''}`;
         if (!this.valueFormat) {
             return strVal;
         }

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

@@ -104,6 +104,16 @@ export declare class KanbanController extends DataViewControlController<IDEKanba
      * @return {*}  {Promise<void>}
      */
     onDragChange(info: IDragChangeInfo): Promise<void>;
+    /**
+     * 移动并排序数据
+     *
+     * @author tony001
+     * @date 2024-06-17 15:06:22
+     * @param {IData} draggedItem
+     * @param {IData} moveMeta
+     * @return {*}  {Promise<ControlVO[]>}
+     */
+    moveOrderItem(draggedItem: IData, moveMeta: IData): Promise<ControlVO[]>;
     /**
      * 批量更新修改的项，并更新后台返回的数据，然后重新计算分组和排序
      * @author lxm

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

@@ -1 +1 @@
-{"version":3,"file":"kanban.controller.d.ts","sourceRoot":"","sources":["../../../../src/controller/control/kanban/kanban.controller.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"kanban.controller.d.ts","sourceRoot":"","sources":["../../../../src/controller/control/kanban/kanban.controller.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,SAAS,EAAE,oBAAoB,EAAE,MAAM,kBAAkB,CAAC;AAEnE,OAAO,EAEL,eAAe,EACf,iBAAiB,EACjB,YAAY,EACZ,iBAAiB,EACjB,YAAY,EACZ,kBAAkB,EAClB,gBAAgB,EACjB,MAAM,oBAAoB,CAAC;AAE5B,OAAO,EAAE,SAAS,EAAE,MAAM,kBAAkB,CAAC;AAC7C,OAAO,EAAE,yBAAyB,EAAE,MAAM,cAAc,CAAC;AACzD,OAAO,EAAE,aAAa,EAAE,MAAM,kBAAkB,CAAC;AAIjD,qBAAa,gBACX,SAAQ,yBAAyB,CAAC,SAAS,EAAE,YAAY,EAAE,YAAY,CACvE,YAAW,iBAAiB;IAE5B;;;;;OAKG;IACK,OAAO,EAAE,aAAa,CAAC;IAE/B;;;;;;OAMG;IACH,IAAI,eAAe,IAAI,OAAO,CAE7B;IAED;;;;;;OAMG;IACH,IAAI,eAAe,IAAI,OAAO,CAE7B;cAEe,kBAAkB,IAAI,OAAO,CAAC,IAAI,CAAC;IAKnD,SAAS,CAAC,SAAS,IAAI,IAAI;IAc3B;;;;;;OAMG;cACa,SAAS,IAAI,OAAO,CAAC,IAAI,CAAC;IAK1C;;;;;OAKG;IACH,SAAS,CAAC,KAAK,EAAE,KAAK,EAAE,GAAG,IAAI;IAwCzB,SAAS,CAAC,IAAI,EAAE,gBAAgB,EAAE,KAAK,EAAE,KAAK,EAAE,GAAG,OAAO,CAAC,KAAK,EAAE,CAAC;IA4CzE;;;;;;OAMG;IACG,UAAU,CAAC,IAAI,EAAE,KAAK,GAAG,OAAO,CAAC,IAAI,CAAC;IAe5C;;;;;;OAMG;IACH,UAAU,CAAC,KAAK,EAAE,UAAU,EAAE,KAAK,EAAE,MAAM,GAAG,MAAM,GAAG,IAAI;IAK3D;;;;;;;;OAQG;IACG,mBAAmB,CACvB,MAAM,EAAE,oBAAoB,EAC5B,KAAK,EAAE,UAAU,EACjB,KAAK,EAAE,iBAAiB,GACvB,OAAO,CAAC,IAAI,CAAC;IAKhB;;;;;;;;;OASG;IACG,kBAAkB,CACtB,MAAM,EAAE,oBAAoB,EAC5B,IAAI,EAAE,KAAK,EACX,KAAK,EAAE,UAAU,EACjB,KAAK,EAAE,iBAAiB,GACvB,OAAO,CAAC,IAAI,CAAC;IAiBhB,eAAe,IAAI,OAAO,CAAC,IAAI,CAAC;IAShC;;;;OAIG;IACH,eAAe,IAAI,IAAI;IAkCvB;;;;;OAKG;IACG,mBAAmB,IAAI,OAAO,CAAC,IAAI,CAAC;IAsC1C;;;;;;OAMG;IACG,YAAY,CAAC,IAAI,EAAE,eAAe,GAAG,OAAO,CAAC,IAAI,CAAC;IA4JxD;;;;;;;;OAQG;IACG,aAAa,CACjB,WAAW,EAAE,KAAK,EAClB,QAAQ,EAAE,KAAK,GACd,OAAO,CAAC,SAAS,EAAE,CAAC;IAkBvB;;;;;;OAMG;IACG,kBAAkB,CAAC,YAAY,EAAE,SAAS,EAAE,GAAG,OAAO,CAAC,IAAI,CAAC;IA4BlE;;;;;OAKG;IACH,aAAa,IAAI,OAAO;IAQxB;;;;;OAKG;IACH,YAAY,CAAC,SAAS,EAAE,KAAK,GAAG,OAAO;IAwBvC;;;;;OAKG;IACH,cAAc,CAAC,GAAG,EAAE,MAAM,GAAG,MAAM,GAAG,IAAI;IAM1C;;;;;;;OAOG;IACH,kBAAkB,CAChB,QAAQ,EAAE,MAAM,GAAG,MAAM,EACzB,IAAI,EAAE,wBAAwB,GAAG,wBAAwB,EACzD,CAAC,EAAE,kBAAkB,GACpB,IAAI;IAOP;;;;OAIG;IACH,eAAe,IAAI,IAAI;IAcvB;;;;;;OAMG;IACH,wBAAwB,CAAC,IAAI,EAAE,MAAM,EAAE,CAAC,EAAE,kBAAkB,GAAG,IAAI;IAcnE;;;;;;OAMG;IACH,wBAAwB,CAAC,IAAI,EAAE,MAAM,EAAE,CAAC,EAAE,kBAAkB,GAAG,IAAI;IAcnE;;;;;OAKG;IACH,SAAS,CAAC,QAAQ,EAAE,MAAM,GAAG,MAAM,GAAG,IAAI;IAU1C;;;;OAIG;IACH,UAAU,IAAI,IAAI;CASnB"}

package/out/controller/control/kanban/kanban.controller.js

@@ -1,5 +1,6 @@
+/* eslint-disable prefer-destructuring */
 import { RuntimeError, RuntimeModelError } from '@ibiz-template/core';
-import { isNil } from 'ramda';
+import { clone, isNil } from 'ramda';
 import { calcDeCodeNameById } from '../../../model';
 import { DataViewControlController } from '../data-view';
 import { KanbanService } from './kanban.service';
@@ -273,17 +274,16 @@ export class KanbanController extends DataViewControlController {
      * @return {*}  {Promise<void>}
      */
     async onDragChange(info) {
+        var _a;
         if (!this.enableEditGroup) {
             if (info.from !== info.to) {
                 ibiz.message.warning(ibiz.i18n.t('runtime.controller.control.kanban.adjustmentsGroup'));
                 return;
             }
         }
-        const isAsc = this.model.minorSortDir === 'ASC';
         const { from, to, fromIndex, toIndex } = info;
         const groupField = this.model.groupAppDEFieldId;
         const sortField = this.model.minorSortAppDEFieldId;
-        const modifiedItems = [];
         const fromGroup = this.state.groups.find(x => x.key === from);
         const toGroup = this.state.groups.find(x => x.key === to);
         if (!this.enableEditOrder) {
@@ -296,81 +296,122 @@ export class KanbanController extends DataViewControlController {
             draggedItem[groupField] = info.to; // 变更分组
             return this.updateChangedItems([draggedItem]);
         }
-        /**
-         * 获取下一个100的倍数
-         * @author lxm
-         * @date 2023-09-11 10:03:46
-         * @param {number} num
-         * @return {*}  {number}
-         */
-        const getNextSort = (num) => {
-            return num + (100 - (num % 100));
-        };
         const originArr = [...toGroup.children];
-        const changedArr = [...toGroup.children];
-        // 计算出拖拽前和拖拽后的数组
-        const draggedItem = fromGroup.children[fromIndex];
-        if (info.from !== info.to) {
-            draggedItem[groupField] = info.to; // 变更分组
-            changedArr.splice(toIndex, 0, draggedItem);
-        }
-        else {
-            changedArr.splice(fromIndex, 1);
-            changedArr.splice(toIndex, 0, draggedItem);
+        const moveAction = (_a = this.model.moveControlAction) === null || _a === void 0 ? void 0 : _a.appDEMethodId;
+        if (!moveAction) {
+            throw new RuntimeModelError(this.model, ibiz.i18n.t('runtime.controller.common.md.noMoveDataCconfig'));
         }
-        // 前台先改值
-        const removeItems = fromGroup.children.splice(fromIndex, 1);
-        toGroup.children.splice(toIndex, 0, ...removeItems);
-        // 降序把数组反转,保证两个数组都是从小到大排
-        if (!isAsc) {
-            originArr.reverse();
-            changedArr.reverse();
-        }
-        let lastSort;
-        let cacheArr = []; // 缓存的不修改数组
-        let cacheLastSort; // 缓存不修改数组第一个元素上一个排序值
-        changedArr.forEach((item, index) => {
-            if (lastSort === undefined) {
-                // 第一次出现要调整顺序的，如果不是0用原来位置的排序值，否则使用100
-                if (item !== originArr[index]) {
-                    if (!originArr[index]) {
-                        // 从别的分组挪进来的且处于末尾时使用上一个元素的排序值的后一个100
-                        lastSort =
-                            index === 0 ? 100 : getNextSort(originArr[index - 1][sortField]);
+        this.state.updating = true;
+        // 计算移动数据,目标分组指定位置存在数据，则添加到目标分组指定位置之前，若没有，则添加到当前分组数据或者所有数据排序值最大的后面，优先当前分组数据
+        const computeMoveData = (_fromIndex, _toIndex, _draggedItem, targetArray, allArray) => {
+            let moveData = {};
+            const targetItem = targetArray[_toIndex];
+            if (!targetItem) {
+                let tempArray = [];
+                if (targetArray.length > 0) {
+                    tempArray = targetArray;
+                }
+                else if (allArray.length > 0) {
+                    tempArray = allArray;
+                }
+                const maxItem = tempArray.reduce((prev, curr) => {
+                    const sortCondition = prev[sortField] > curr[sortField];
+                    if (sortCondition &&
+                        prev[this.dataEntity.keyAppDEFieldId] !== _draggedItem.srfkey) {
+                        return prev;
                     }
-                    else {
-                        lastSort = originArr[index][sortField] || 100; // 如果是0的时候给100否则用原来的
+                    if (!sortCondition &&
+                        curr[this.dataEntity.keyAppDEFieldId] !== _draggedItem.srfkey) {
+                        return curr;
                     }
-                    item[sortField] = lastSort;
-                    modifiedItems.push(item);
+                    return prev;
+                });
+                if (maxItem) {
+                    moveData = {
+                        srftargetkey: maxItem.srfkey,
+                        srfmovetype: 'MOVEAFTER',
+                    };
                 }
             }
             else {
-                // 如果当前排序值比上一个小，提升它的排序值
-                if (lastSort >= item[sortField]) {
-                    if (cacheArr.length > 0) {
-                        cacheArr.forEach(cache => {
-                            cache[sortField] = getNextSort(cacheLastSort);
-                            modifiedItems.push(cache);
-                            cacheLastSort = cache[sortField];
-                        });
-                        lastSort = cacheLastSort;
-                        cacheLastSort = 0;
-                        cacheArr = [];
-                    }
-                    item[sortField] = getNextSort(lastSort);
-                    modifiedItems.push(item);
+                moveData = {
+                    srftargetkey: targetItem.srfkey,
+                    srfmovetype: 'MOVEBEFORE',
+                };
+            }
+            return moveData;
+        };
+        // 拖拽数据
+        const draggedItem = clone(fromGroup.children[fromIndex]);
+        // 前台先改值
+        const removeItems = fromGroup.children.splice(fromIndex, 1);
+        toGroup.children.splice(toIndex, 0, ...removeItems);
+        if (info.from !== info.to) {
+            // 变更分组
+            draggedItem[groupField] = info.to;
+            // 存在移动数据行为，先变更分组再变更排序
+            const app = ibiz.hub.getApp(this.model.appId);
+            const deName = calcDeCodeNameById(this.model.appDataEntityId);
+            const tempContext = this.context.clone();
+            tempContext[deName] = draggedItem.srfkey;
+            try {
+                await app.deService.exec(this.model.appDataEntityId, 'update', tempContext, draggedItem);
+                const index = this.state.items.findIndex(x => x.srfkey === draggedItem[this.dataEntity.keyAppDEFieldId]);
+                if (index !== -1) {
+                    this.state.items.splice(index, 1, draggedItem);
                 }
-                else {
-                    if (cacheArr.length === 0) {
-                        cacheLastSort = lastSort;
+            }
+            catch (error) {
+                this.state.updating = false;
+                throw new RuntimeModelError(this.model, ibiz.i18n.t('runtime.controller.common.md.changeGroupError'));
+            }
+        }
+        // 移动排序
+        const params = computeMoveData(fromIndex, toIndex, draggedItem, originArr, this.state.items);
+        try {
+            const result = await this.moveOrderItem(draggedItem, params);
+            // 返回空数组不做处理，非空数组同步界面数据,无数据界面重刷新
+            if (Array.isArray(result) && result.length > 0) {
+                result.forEach(item => {
+                    const index = this.state.items.findIndex(x => x.srfkey === item[this.dataEntity.keyAppDEFieldId]);
+                    if (index !== -1) {
+                        this.state.items[index][sortField] = item[sortField];
                     }
-                    cacheArr.push(item);
-                }
-                lastSort = item[sortField];
+                });
             }
-        });
-        this.updateChangedItems(modifiedItems);
+            else {
+                await this.refresh();
+            }
+        }
+        catch (error) {
+            this.state.updating = false;
+            this.actionNotification(`MOVEERROR`, {
+                error: error,
+            });
+        }
+        finally {
+            await this.afterLoad({}, this.state.items);
+            this.state.updating = false;
+        }
+    }
+    /**
+     * 移动并排序数据
+     *
+     * @author tony001
+     * @date 2024-06-17 15:06:22
+     * @param {IData} draggedItem
+     * @param {IData} moveMeta
+     * @return {*}  {Promise<ControlVO[]>}
+     */
+    async moveOrderItem(draggedItem, moveMeta) {
+        const deName = calcDeCodeNameById(this.model.appDataEntityId);
+        const tempContext = this.context.clone();
+        tempContext[deName] = draggedItem.srfkey;
+        if (!moveMeta.srftargetkey || !moveMeta.srfmovetype) {
+            throw new RuntimeModelError(this.model, ibiz.i18n.t('runtime.controller.common.md.computeMoveMetaError'));
+        }
+        const res = await this.service.moveOrderItem(tempContext, draggedItem, moveMeta);
+        return res.data;
     }
     /**
      * 批量更新修改的项，并更新后台返回的数据，然后重新计算分组和排序

package/out/controller/control/kanban/kanban.service.d.ts

@@ -20,5 +20,15 @@ export declare class KanbanService extends DataViewControlService<IDEKanban> {
      * @returns {*}
      */
     updateGroup(context: IContext, data: ControlVO): Promise<IHttpResponse<ControlVO>>;
+    /**
+     * 移动并排序数据
+     *
+     * @author tony001
+     * @date 2024-06-16 12:06:02
+     * @param {IContext} context
+     * @param {ControlVO} data
+     * @return {*}  {Promise<IHttpResponse<ControlVO[]>>}
+     */
+    moveOrderItem(context: IContext, data: ControlVO, args: IData): Promise<IHttpResponse<ControlVO[]>>;
 }
 //# sourceMappingURL=kanban.service.d.ts.map

package/out/controller/control/kanban/kanban.service.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"kanban.service.d.ts","sourceRoot":"","sources":["../../../../src/controller/control/kanban/kanban.service.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,aAAa,EAAE,MAAM,qBAAqB,CAAC;AACpD,OAAO,EAAE,SAAS,EAAE,MAAM,kBAAkB,CAAC;AAC7C,OAAO,EAAE,SAAS,EAAE,MAAM,kBAAkB,CAAC;AAC7C,OAAO,EAAE,sBAAsB,EAAE,MAAM,cAAc,CAAC;AAEtD;;;;;;GAMG;AACH,qBAAa,aAAc,SAAQ,sBAAsB,CAAC,SAAS,CAAC;IAClE;;;;;;;;OAQG;IACG,WAAW,CACf,OAAO,EAAE,QAAQ,EACjB,IAAI,EAAE,SAAS,GACd,OAAO,CAAC,aAAa,CAAC,SAAS,CAAC,CAAC;CAOrC"}
+{"version":3,"file":"kanban.service.d.ts","sourceRoot":"","sources":["../../../../src/controller/control/kanban/kanban.service.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,aAAa,EAAE,MAAM,qBAAqB,CAAC;AACpD,OAAO,EAAE,SAAS,EAAE,MAAM,kBAAkB,CAAC;AAE7C,OAAO,EAAE,SAAS,EAAE,MAAM,kBAAkB,CAAC;AAC7C,OAAO,EAAE,sBAAsB,EAAE,MAAM,cAAc,CAAC;AAEtD;;;;;;GAMG;AACH,qBAAa,aAAc,SAAQ,sBAAsB,CAAC,SAAS,CAAC;IAClE;;;;;;;;OAQG;IACG,WAAW,CACf,OAAO,EAAE,QAAQ,EACjB,IAAI,EAAE,SAAS,GACd,OAAO,CAAC,aAAa,CAAC,SAAS,CAAC,CAAC;IAQpC;;;;;;;;OAQG;IACG,aAAa,CACjB,OAAO,EAAE,QAAQ,EACjB,IAAI,EAAE,SAAS,EACf,IAAI,EAAE,KAAK,GACV,OAAO,CAAC,aAAa,CAAC,SAAS,EAAE,CAAC,CAAC;CAUvC"}

package/out/controller/control/kanban/kanban.service.js

@@ -1,3 +1,4 @@
+import { clone } from 'ramda';
 import { DataViewControlService } from '../data-view';
 /**
  * 看板（kanban）部件服务
@@ -23,4 +24,23 @@ export class KanbanService extends DataViewControlService {
         res = this.handleResponse(res);
         return res;
     }
+    /**
+     * 移动并排序数据
+     *
+     * @author tony001
+     * @date 2024-06-16 12:06:02
+     * @param {IContext} context
+     * @param {ControlVO} data
+     * @return {*}  {Promise<IHttpResponse<ControlVO[]>>}
+     */
+    async moveOrderItem(context, data, args) {
+        const moveAction = this.model.moveControlAction.appDEMethodId;
+        const params = clone(data.getOrigin());
+        Object.assign(params, args);
+        let res = await this.exec(moveAction, context, params, {
+            srfupdateitem: true,
+        });
+        res = this.handleResponse(res);
+        return res;
+    }
 }

package/out/controller/control/report-panel/generator/bi-generator.d.ts

@@ -0,0 +1,21 @@
+import { ReportPanelBaseGenerator } from './base-generator';
+/**
+ * BI报表相关
+ *
+ * @author tony001
+ * @date 2024-06-18 13:06:30
+ * @export
+ * @class BIReportPanelGenerator
+ * @extends {ReportPanelBaseGenerator}
+ */
+export declare class BIReportPanelGenerator extends ReportPanelBaseGenerator {
+    /**
+     * 设置配置
+     *
+     * @author tony001
+     * @date 2024-06-18 14:06:38
+     * @protected
+     */
+    protected setConfig(): void;
+}
+//# sourceMappingURL=bi-generator.d.ts.map

package/out/controller/control/report-panel/generator/bi-generator.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"bi-generator.d.ts","sourceRoot":"","sources":["../../../../../src/controller/control/report-panel/generator/bi-generator.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,wBAAwB,EAAE,MAAM,kBAAkB,CAAC;AAC5D;;;;;;;;GAQG;AACH,qBAAa,sBAAuB,SAAQ,wBAAwB;IAClE;;;;;;OAMG;IACH,SAAS,CAAC,SAAS,IAAI,IAAI;CAiB5B"}

package/out/controller/control/report-panel/generator/bi-generator.js

@@ -0,0 +1,33 @@
+import { RuntimeError } from '@ibiz-template/core';
+import { ScriptFactory } from '../../../../utils';
+import { ReportPanelBaseGenerator } from './base-generator';
+/**
+ * BI报表相关
+ *
+ * @author tony001
+ * @date 2024-06-18 13:06:30
+ * @export
+ * @class BIReportPanelGenerator
+ * @extends {ReportPanelBaseGenerator}
+ */
+export class BIReportPanelGenerator extends ReportPanelBaseGenerator {
+    /**
+     * 设置配置
+     *
+     * @author tony001
+     * @date 2024-06-18 14:06:38
+     * @protected
+     */
+    setConfig() {
+        var _a;
+        if (!((_a = this.model.appDEReport) === null || _a === void 0 ? void 0 : _a.reportUIModel)) {
+            throw new RuntimeError(ibiz.i18n.t('runtime.controller.control.reportPanel.noReportUIModel'));
+        }
+        const sourceModel = ScriptFactory.execScriptFn({}, this.model.appDEReport.reportUIModel, {
+            isAsync: false,
+            singleRowReturn: true,
+        });
+        sourceModel.reportTag = this.model.appDEReport.id;
+        this.config = sourceModel;
+    }
+}

package/out/controller/control/report-panel/generator/generator-factory.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"generator-factory.d.ts","sourceRoot":"","sources":["../../../../../src/controller/control/report-panel/generator/generator-factory.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,cAAc,EAAE,MAAM,kBAAkB,CAAC;AAGlD,OAAO,EAAE,wBAAwB,EAAE,MAAM,kBAAkB,CAAC;AAC5D;;;;;GAKG;AACH,qBAAa,2BAA2B;IACtC;;;;;;;OAOG;WACW,WAAW,CAAC,KAAK,EAAE,cAAc,GAAG,wBAAwB;CAmB3E"}
+{"version":3,"file":"generator-factory.d.ts","sourceRoot":"","sources":["../../../../../src/controller/control/report-panel/generator/generator-factory.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,cAAc,EAAE,MAAM,kBAAkB,CAAC;AAGlD,OAAO,EAAE,wBAAwB,EAAE,MAAM,kBAAkB,CAAC;AAE5D;;;;;GAKG;AACH,qBAAa,2BAA2B;IACtC;;;;;;;OAOG;WACW,WAAW,CAAC,KAAK,EAAE,cAAc,GAAG,wBAAwB;CA4B3E"}

package/out/controller/control/report-panel/generator/generator-factory.js

@@ -1,5 +1,6 @@
 import { UserReportPanelGenerator } from './user-generator';
 import { User2ReportPanelGenerator } from './user2-generator';
+import { BIReportPanelGenerator } from './bi-generator';
 /**
  * 报表面板生成器工厂
  *
@@ -24,6 +25,15 @@ export class ReportPanelGeneratorFactory {
                 return new UserReportPanelGenerator(model);
             case 'USER2':
                 return new User2ReportPanelGenerator(model);
+            case 'DESYSBIREPORTS':
+            case 'DESYSBIREPORTS':
+            case 'SYSBICUBE':
+            case 'DESYSBICUBES':
+            case 'ALLSYSBICUBES':
+            case 'SYSBIREPORT':
+            case 'SYSBICUBEREPORTS':
+            case 'ALLSYSBIREPORTS':
+                return new BIReportPanelGenerator(model);
             default:
                 throw new Error(ibiz.i18n.t('runtime.controller.control.reportPanel.noImplemented', {
                     reportType: model.appDEReport.reportType,

package/out/controller/control/report-panel/report-panel.controller.d.ts

@@ -102,5 +102,13 @@ export declare class ReportPanelController extends ControlController<IDEReportPa
      * @date 2023-05-23 03:42:41
      */
     refresh(): Promise<void>;
+    /**
+     * 打开设计界面
+     *
+     * @author tony001
+     * @date 2024-06-18 16:06:46
+     * @return {*}  {Promise<boolean>}
+     */
+    openReportDesignPage(): Promise<boolean>;
 }
 //# sourceMappingURL=report-panel.controller.d.ts.map

package/out/controller/control/report-panel/report-panel.controller.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"report-panel.controller.d.ts","sourceRoot":"","sources":["../../../../src/controller/control/report-panel/report-panel.controller.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,cAAc,EAAE,cAAc,EAAE,MAAM,kBAAkB,CAAC;AAClE,OAAO,EACL,gBAAgB,EAChB,sBAAsB,EACtB,iBAAiB,EACjB,iBAAiB,EAClB,MAAM,oBAAoB,CAAC;AAC5B,OAAO,EAAE,iBAAiB,EAAE,MAAM,cAAc,CAAC;AACjD,OAAO,EAAE,kBAAkB,EAAE,MAAM,wBAAwB,CAAC;AAC5D,OAAO,EAAE,eAAe,EAAE,MAAM,aAAa,CAAC;AAC9C,OAAO,EAAE,wBAAwB,EAAE,MAAM,4BAA4B,CAAC;AAGtE,qBAAa,qBACX,SAAQ,iBAAiB,CACvB,cAAc,EACd,iBAAiB,EACjB,iBAAiB,CAEnB,YAAW,sBAAsB;IAEjC;;;;OAIG;IACH,SAAS,CAAC,OAAO,EAAG,kBAAkB,CAAC;IAEvC;;;;;OAKG;IACH,SAAS,CAAC,UAAU,EAAG,cAAc,CAAC;IAEtC;;;;;;OAMG;IACI,SAAS,EAAG,wBAAwB,CAAC;IAE5C;;;;;;;OAOG;IACH,SAAS,KAAK,IAAI,IAAI,eAAe,CAAC,iBAAiB,CAAC,CAEvD;IAED;;;;;OAKG;IACH,SAAS,CAAC,SAAS,IAAI,IAAI;IAQ3B;;;;;OAKG;cACa,SAAS,IAAI,OAAO,CAAC,IAAI,CAAC;IAW1C;;;;;;OAMG;cACa,SAAS,IAAI,OAAO,CAAC,IAAI,CAAC;IAS1C;;;;;;OAMG;IACH,SAAS,CAAC,WAAW,IAAI,OAAO,CAAC,IAAI,CAAC;IAItC;;;;;;;OAOG;IACU,IAAI,CAAC,IAAI,GAAE,gBAAqB,GAAG,OAAO,CAAC,KAAK,CAAC;IA4B9D;;;;;;;;OAQG;IACG,SAAS,CAAC,IAAI,EAAE,gBAAgB,EAAE,IAAI,EAAE,KAAK,GAAG,OAAO,CAAC,KAAK,CAAC;IAIpE;;;;OAIG;IACG,cAAc,CAAC,WAAW,CAAC,EAAE,OAAO,GAAG,OAAO,CAAC,OAAO,CAAC;IAkB7D;;;;;OAKG;IACH,OAAO,IAAI,KAAK,EAAE;IAIlB;;;OAGG;IACG,OAAO,IAAI,OAAO,CAAC,IAAI,CAAC;CAK/B"}
+{"version":3,"file":"report-panel.controller.d.ts","sourceRoot":"","sources":["../../../../src/controller/control/report-panel/report-panel.controller.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,cAAc,EAAE,cAAc,EAAE,MAAM,kBAAkB,CAAC;AAClE,OAAO,EACL,gBAAgB,EAChB,sBAAsB,EACtB,iBAAiB,EACjB,iBAAiB,EAElB,MAAM,oBAAoB,CAAC;AAC5B,OAAO,EAAE,iBAAiB,EAAE,MAAM,cAAc,CAAC;AACjD,OAAO,EAAE,kBAAkB,EAAE,MAAM,wBAAwB,CAAC;AAC5D,OAAO,EAAE,eAAe,EAAE,MAAM,aAAa,CAAC;AAC9C,OAAO,EAAE,wBAAwB,EAAE,MAAM,4BAA4B,CAAC;AAGtE,qBAAa,qBACX,SAAQ,iBAAiB,CACvB,cAAc,EACd,iBAAiB,EACjB,iBAAiB,CAEnB,YAAW,sBAAsB;IAEjC;;;;OAIG;IACH,SAAS,CAAC,OAAO,EAAG,kBAAkB,CAAC;IAEvC;;;;;OAKG;IACH,SAAS,CAAC,UAAU,EAAG,cAAc,CAAC;IAEtC;;;;;;OAMG;IACI,SAAS,EAAG,wBAAwB,CAAC;IAE5C;;;;;;;OAOG;IACH,SAAS,KAAK,IAAI,IAAI,eAAe,CAAC,iBAAiB,CAAC,CAEvD;IAED;;;;;OAKG;IACH,SAAS,CAAC,SAAS,IAAI,IAAI;IAQ3B;;;;;OAKG;cACa,SAAS,IAAI,OAAO,CAAC,IAAI,CAAC;IAW1C;;;;;;OAMG;cACa,SAAS,IAAI,OAAO,CAAC,IAAI,CAAC;IAQ1C;;;;;;OAMG;IACH,SAAS,CAAC,WAAW,IAAI,OAAO,CAAC,IAAI,CAAC;IAItC;;;;;;;OAOG;IACU,IAAI,CAAC,IAAI,GAAE,gBAAqB,GAAG,OAAO,CAAC,KAAK,CAAC;IAyC9D;;;;;;;;OAQG;IACG,SAAS,CAAC,IAAI,EAAE,gBAAgB,EAAE,IAAI,EAAE,KAAK,GAAG,OAAO,CAAC,KAAK,CAAC;IAIpE;;;;OAIG;IACG,cAAc,CAAC,WAAW,CAAC,EAAE,OAAO,GAAG,OAAO,CAAC,OAAO,CAAC;IAkB7D;;;;;OAKG;IACH,OAAO,IAAI,KAAK,EAAE;IAIlB;;;OAGG;IACG,OAAO,IAAI,OAAO,CAAC,IAAI,CAAC;IAM9B;;;;;;OAMG;IACG,oBAAoB,IAAI,OAAO,CAAC,OAAO,CAAC;CAgC/C"}

package/out/controller/control/report-panel/report-panel.controller.js

@@ -72,6 +72,17 @@ export class ReportPanelController extends ControlController {
      * @memberof ReportPanelController
      */
     async load(args = {}) {
+        if (this.state.reportType &&
+            (this.state.reportType === 'DESYSBIREPORTS' ||
+                this.state.reportType === 'DESYSBIREPORTS' ||
+                this.state.reportType === 'SYSBICUBE' ||
+                this.state.reportType === 'DESYSBICUBES' ||
+                this.state.reportType === 'ALLSYSBICUBES' ||
+                this.state.reportType === 'SYSBIREPORT' ||
+                this.state.reportType === 'SYSBICUBEREPORTS' ||
+                this.state.reportType === 'ALLSYSBIREPORTS')) {
+            return {};
+        }
         await this.startLoading();
         try {
             // *查询参数处理
@@ -143,4 +154,37 @@ export class ReportPanelController extends ControlController {
             key: 'refresh',
         });
     }
+    /**
+     * 打开设计界面
+     *
+     * @author tony001
+     * @date 2024-06-18 16:06:46
+     * @return {*}  {Promise<boolean>}
+     */
+    async openReportDesignPage() {
+        if (this.state.reportType &&
+            (this.state.reportType === 'DESYSBIREPORTS' ||
+                this.state.reportType === 'DESYSBIREPORTS' ||
+                this.state.reportType === 'SYSBICUBE' ||
+                this.state.reportType === 'DESYSBICUBES' ||
+                this.state.reportType === 'ALLSYSBICUBES' ||
+                this.state.reportType === 'SYSBIREPORT' ||
+                this.state.reportType === 'SYSBICUBEREPORTS' ||
+                this.state.reportType === 'ALLSYSBIREPORTS')) {
+            const modal = ibiz.overlay.createModal('BIReportDesign', {
+                dismiss: () => modal.dismiss(),
+                context: this.context,
+                viewParams: this.params,
+                config: this.generator.config,
+            }, {
+                width: '90%',
+                height: '90%',
+                footerHide: true,
+            });
+            modal.present();
+            const result = await modal.onWillDismiss();
+            return result.ok || false;
+        }
+        return true;
+    }
 }

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,CAkF7B"}
+{"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"}