@ibiz-template/runtime 0.2.5 → 0.2.7

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

@@ -4,7 +4,7 @@ import { GridColumnController } from './grid-column.controller';
 import { GridRowState } from './grid-row.state';
 import { GridService } from './grid.service';
 import { GridFieldEditColumnController, GridUAColumnController } from '../grid-column';
-import { IGridState, IGridEvent, IGridController, IGridColumnProvider, CodeListItem, MDCtrlLoadParams } from '../../../../interface';
+import { IGridState, IGridEvent, IGridController, IGridColumnProvider, CodeListItem, MDCtrlLoadParams, IGridRowState } from '../../../../interface';
 import { ControlVO } from '../../../../service';
 import { MDControlController } from '../../../common';
 import { GridNotifyState } from '../../../constant';
@@ -319,5 +319,21 @@ export declare class GridController extends MDControlController<IDEGrid, IGridSt
      * @return {*}  {IData}
      */
     calcDefaultValue(data: IData, isCreate: boolean): IData;
+    /**
+     * 查找rowState
+     * @author lxm
+     * @date 2023-10-27 07:27:48
+     * @param {IData} data
+     * @return {*}  {(IGridRowState)}
+     */
+    findRowStateIndex(data: IData): number;
+    /**
+     * 查找rowState
+     * @author lxm
+     * @date 2023-10-27 07:27:48
+     * @param {IData} data
+     * @return {*}  {(IGridRowState | undefined)}
+     */
+    findRowState(data: IData): IGridRowState | undefined;
 }
 //# sourceMappingURL=grid.controller.d.ts.map

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

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

@@ -294,7 +294,7 @@ export class GridController extends MDControlController {
     afterRemove(data) {
         super.afterRemove(data);
         // 删除this.state.rows里的表格行数据
-        const index = this.state.rows.findIndex(item => item.data.srfkey === data.srfkey);
+        const index = this.findRowStateIndex(data);
         this.state.rows.splice(index, 1);
         // 删除分组里的那条数据
         this.state.groups.forEach(item => {
@@ -314,15 +314,18 @@ export class GridController extends MDControlController {
      */
     async newRow() {
         const { enableRowEdit, enableRowNew } = this.model;
+        const { editShowMode } = ibiz.config.grid;
         if (!enableRowEdit ||
             !enableRowNew ||
-            ibiz.config.grid.editShowMode !== 'row') {
+            !['row', 'all'].includes(editShowMode)) {
             ibiz.log.error('不支持新建行');
             return;
         }
-        const editingRow = this.state.rows.find(item => item.showRowEdit);
-        if (editingRow) {
-            throw new RuntimeError('请先完成当前行编辑中的行的操作');
+        if (editShowMode === 'row') {
+            const editingRow = this.state.rows.find(item => item.showRowEdit);
+            if (editingRow) {
+                throw new RuntimeError('请先完成当前行编辑中的行的操作');
+            }
         }
         const queryParams = Object.assign({}, this.params);
         const defaultData = this.calcDefaultValue({}, true); // 新建默认值
@@ -345,7 +348,9 @@ export class GridController extends MDControlController {
         const newRow = new GridRowState(draftData, this);
         this.state.rows.unshift(newRow);
         this.gridStateNotify(newRow, GridNotifyState.DRAFT);
-        this.switchRowEdit(this.state.rows[0], true);
+        if (editShowMode === 'row') {
+            this.switchRowEdit(this.state.rows[0], true);
+        }
         this.actionNotification('GETDRAFTSUCCESS', { data: draftData });
     }
     /**
@@ -360,7 +365,8 @@ export class GridController extends MDControlController {
         if (this.state.isSimple) {
             return;
         }
-        const rowState = this.state.rows.find(item => item.data.srfkey === data.srfkey);
+        const isCreate = data.srfuf === Srfuf.CREATE;
+        const rowState = this.findRowState(data);
         if (!rowState) {
             throw new RuntimeError('行数据不存在');
         }
@@ -379,7 +385,6 @@ export class GridController extends MDControlController {
         }
         await this.startLoading();
         let res;
-        const isCreate = data.srfuf === Srfuf.CREATE;
         const deName = calcDeCodeNameById(this.model.appDataEntityId);
         const tempContext = this.context.clone();
         tempContext[deName] = data.srfkey;
@@ -400,7 +405,7 @@ export class GridController extends MDControlController {
             await this.endLoading();
         }
         // 后续处理
-        const index = this.state.items.findIndex(item => item.srfkey === data.srfkey);
+        const index = this.findRowStateIndex(data);
         this.state.items.splice(index, 1, res.data);
         rowState.data = res.data;
         rowState.modified = false;
@@ -848,4 +853,27 @@ export class GridController extends MDControlController {
         });
         return result;
     }
+    /**
+     * 查找rowState
+     * @author lxm
+     * @date 2023-10-27 07:27:48
+     * @param {IData} data
+     * @return {*}  {(IGridRowState)}
+     */
+    findRowStateIndex(data) {
+        const isCreate = data.srfuf === Srfuf.CREATE;
+        const compareKey = isCreate ? 'tempsrfkey' : 'srfkey';
+        return this.state.rows.findIndex(item => item.data[compareKey] === data[compareKey]);
+    }
+    /**
+     * 查找rowState
+     * @author lxm
+     * @date 2023-10-27 07:27:48
+     * @param {IData} data
+     * @return {*}  {(IGridRowState | undefined)}
+     */
+    findRowState(data) {
+        const index = this.findRowStateIndex(data);
+        return index !== -1 ? this.state.rows[index] : undefined;
+    }
 }

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

@@ -1 +1 @@
-{"version":3,"file":"grid-field-column.controller.d.ts","sourceRoot":"","sources":["../../../../../../src/controller/control/grid/grid-column/grid-field-column/grid-field-column.controller.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,YAAY,EAAE,kBAAkB,EAAE,MAAM,kBAAkB,CAAC;AAKpE,OAAO,EAAE,YAAY,EAAc,MAAM,0BAA0B,CAAC;AAKpE,OAAO,EAAE,oBAAoB,EAAE,MAAM,mCAAmC,CAAC;AACzE,OAAO,EAAE,YAAY,EAAE,MAAM,2BAA2B,CAAC;AAEzD;;;;;GAKG;AACH,qBAAa,yBAA0B,SAAQ,oBAAoB,CAAC,kBAAkB,CAAC;IACrF;;;;;;OAMG;IACH,aAAa,CAAC,EAAE,SAAS,YAAY,EAAE,CAAC;IAExC;;;;;OAKG;IACH,QAAQ,EAAE,YAAY,GAAG,SAAS,CAAa;IAE/C;;;;;;OAMG;IACH,IAAI,YAAY,IAAI,OAAO,CAE1B;IAED;;;;;;;OAOG;IACH,IAAI,SAAS,IAAI,OAAO,CAEvB;cAEe,MAAM,IAAI,OAAO,CAAC,IAAI,CAAC;IAavC;;;;;;OAMG;IACH,SAAS,CAAC,GAAG,EAAE,YAAY,GAAG,OAAO;IAKrC;;;;;OAKG;IACI,kBAAkB,CACvB,IAAI,EAAE,KAAK,EACX,OAAO,EAAE,QAAQ,EACjB,MAAM,EAAE,OAAO,GACd;QAAE,OAAO,EAAE,QAAQ,CAAC;QAAC,MAAM,EAAE,OAAO,CAAA;KAAE;IAoBzC;;;;;;;;OAQG;IACG,YAAY,CAAC,GAAG,EAAE,YAAY,EAAE,KAAK,EAAE,UAAU,GAAG,OAAO,CAAC,IAAI,CAAC;IAuCvE;;;;;;;;OAQG;IACG,aAAa,CAAC,GAAG,EAAE,YAAY,EAAE,KAAK,EAAE,UAAU,GAAG,OAAO,CAAC,IAAI,CAAC;IAWxE;;;;;;OAMG;IACG,YAAY,IAAI,OAAO,CAAC,QAAQ,CAAC,YAAY,EAAE,CAAC,GAAG,SAAS,CAAC;IAqBnE;;;;;;;OAOG;IACH,YAAY,CAAC,KAAK,EAAE,KAAK,EAAE,GAAG,MAAM,GAAG,SAAS;IAqEhD;;;;;;OAMG;IACH,WAAW,CAAC,KAAK,GAAE,OAAY,GAAG,MAAM;CAiBzC"}
+{"version":3,"file":"grid-field-column.controller.d.ts","sourceRoot":"","sources":["../../../../../../src/controller/control/grid/grid-column/grid-field-column/grid-field-column.controller.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,YAAY,EAAE,kBAAkB,EAAE,MAAM,kBAAkB,CAAC;AAKpE,OAAO,EAAE,YAAY,EAAc,MAAM,0BAA0B,CAAC;AAKpE,OAAO,EAAE,oBAAoB,EAAE,MAAM,mCAAmC,CAAC;AACzE,OAAO,EAAE,YAAY,EAAE,MAAM,2BAA2B,CAAC;AAEzD;;;;;GAKG;AACH,qBAAa,yBAA0B,SAAQ,oBAAoB,CAAC,kBAAkB,CAAC;IACrF;;;;;;OAMG;IACH,aAAa,CAAC,EAAE,SAAS,YAAY,EAAE,CAAC;IAExC;;;;;OAKG;IACH,QAAQ,EAAE,YAAY,GAAG,SAAS,CAAa;IAE/C;;;;;;OAMG;IACH,IAAI,YAAY,IAAI,OAAO,CAE1B;IAED;;;;;;;OAOG;IACH,IAAI,SAAS,IAAI,OAAO,CAEvB;cAEe,MAAM,IAAI,OAAO,CAAC,IAAI,CAAC;IAavC;;;;;;OAMG;IACH,SAAS,CAAC,GAAG,EAAE,YAAY,GAAG,OAAO;IAKrC;;;;;OAKG;IACI,kBAAkB,CACvB,IAAI,EAAE,KAAK,EACX,OAAO,EAAE,QAAQ,EACjB,MAAM,EAAE,OAAO,GACd;QAAE,OAAO,EAAE,QAAQ,CAAC;QAAC,MAAM,EAAE,OAAO,CAAA;KAAE;IAoBzC;;;;;;;;OAQG;IACG,YAAY,CAAC,GAAG,EAAE,YAAY,EAAE,KAAK,EAAE,UAAU,GAAG,OAAO,CAAC,IAAI,CAAC;IAuCvE;;;;;;;;OAQG;IACG,aAAa,CAAC,GAAG,EAAE,YAAY,EAAE,KAAK,EAAE,UAAU,GAAG,OAAO,CAAC,IAAI,CAAC;IAWxE;;;;;;OAMG;IACG,YAAY,IAAI,OAAO,CAAC,QAAQ,CAAC,YAAY,EAAE,CAAC,GAAG,SAAS,CAAC;IAqBnE;;;;;;;OAOG;IACH,YAAY,CAAC,KAAK,EAAE,KAAK,EAAE,GAAG,MAAM,GAAG,SAAS;IAqEhD;;;;;;OAMG;IACH,WAAW,CAAC,KAAK,GAAE,OAAY,GAAG,MAAM;CAqBzC"}

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

@@ -256,7 +256,11 @@ export class GridFieldColumnController extends GridColumnController {
         }
         const isDate = DataTypes.isDate(this.dataType);
         if (isDate) {
-            return dayjs(strVal).format(this.valueFormat);
+            const formatVal = dayjs(strVal).format(this.valueFormat);
+            if (formatVal !== 'Invalid Date') {
+                return formatVal;
+            }
+            return strVal;
         }
         return ibiz.util.text.format(strVal, this.valueFormat);
     }

package/out/controller/control/pickup-view-panel/pickup-view-panel.controller.d.ts

@@ -25,6 +25,10 @@ export declare class PickupViewPanelController extends ControlController<IDEPick
      * @memberof PickupViewPanelController
      */
     protected onCreated(): Promise<void>;
+    updateContextParams(opts: {
+        context?: IContext | undefined;
+        params?: IParams | undefined;
+    }): void;
     /**
      * 初始化导航参数
      *

package/out/controller/control/pickup-view-panel/pickup-view-panel.controller.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"pickup-view-panel.controller.d.ts","sourceRoot":"","sources":["../../../../src/controller/control/pickup-view-panel/pickup-view-panel.controller.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,cAAc,EAAE,kBAAkB,EAAE,MAAM,kBAAkB,CAAC;AAEtE,OAAO,EACL,qBAAqB,EACrB,qBAAqB,EACrB,0BAA0B,EAC1B,eAAe,EACf,oBAAoB,EACpB,oBAAoB,EACrB,MAAM,oBAAoB,CAAC;AAE5B,OAAO,EAAE,iBAAiB,EAAE,MAAM,cAAc,CAAC;AAEjD;;;;;;;GAOG;AACH,qBAAa,yBACX,SAAQ,iBAAiB,CACvB,kBAAkB,EAClB,qBAAqB,EACrB,qBAAqB,CAEvB,YAAW,0BAA0B;IAErC;;;;;OAKG;IACH,SAAS,EAAG,eAAe,CACzB,cAAc,EACd,oBAAoB,EACpB,oBAAoB,CACrB,CAAC;IAEF;;;;;;OAMG;cACa,SAAS,IAAI,OAAO,CAAC,IAAI,CAAC;IAO1C;;;;OAIG;IACH,YAAY,IAAI,IAAI;IAoBpB;;;;;OAKG;IACH,YAAY,CACV,IAAI,EAAE,eAAe,CACnB,cAAc,EACd,oBAAoB,EACpB,oBAAoB,CACrB,GACA,IAAI;IAqBP;;;;;;;OAOG;IACG,eAAe,IAAI,OAAO,CAAC,KAAK,EAAE,CAAC;IAKzC;;;;;;;OAOG;IACG,UAAU,IAAI,OAAO,CAAC,KAAK,EAAE,CAAC;CAIrC"}
+{"version":3,"file":"pickup-view-panel.controller.d.ts","sourceRoot":"","sources":["../../../../src/controller/control/pickup-view-panel/pickup-view-panel.controller.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,cAAc,EAAE,kBAAkB,EAAE,MAAM,kBAAkB,CAAC;AAEtE,OAAO,EACL,qBAAqB,EACrB,qBAAqB,EACrB,0BAA0B,EAC1B,eAAe,EACf,oBAAoB,EACpB,oBAAoB,EACrB,MAAM,oBAAoB,CAAC;AAE5B,OAAO,EAAE,iBAAiB,EAAE,MAAM,cAAc,CAAC;AAEjD;;;;;;;GAOG;AACH,qBAAa,yBACX,SAAQ,iBAAiB,CACvB,kBAAkB,EAClB,qBAAqB,EACrB,qBAAqB,CAEvB,YAAW,0BAA0B;IAErC;;;;;OAKG;IACH,SAAS,EAAG,eAAe,CACzB,cAAc,EACd,oBAAoB,EACpB,oBAAoB,CACrB,CAAC;IAEF;;;;;;OAMG;cACa,SAAS,IAAI,OAAO,CAAC,IAAI,CAAC;IAM1C,mBAAmB,CAAC,IAAI,EAAE;QACxB,OAAO,CAAC,EAAE,QAAQ,GAAG,SAAS,CAAC;QAC/B,MAAM,CAAC,EAAE,OAAO,GAAG,SAAS,CAAC;KAC9B,GAAG,IAAI;IAKR;;;;OAIG;IACH,YAAY,IAAI,IAAI;IAoBpB;;;;;OAKG;IACH,YAAY,CACV,IAAI,EAAE,eAAe,CACnB,cAAc,EACd,oBAAoB,EACpB,oBAAoB,CACrB,GACA,IAAI;IAqBP;;;;;;;OAOG;IACG,eAAe,IAAI,OAAO,CAAC,KAAK,EAAE,CAAC;IAKzC;;;;;;;OAOG;IACG,UAAU,IAAI,OAAO,CAAC,KAAK,EAAE,CAAC;CAIrC"}

package/out/controller/control/pickup-view-panel/pickup-view-panel.controller.js

@@ -21,6 +21,9 @@ export class PickupViewPanelController extends ControlController {
         await super.onCreated();
         // 等待嵌入视图mounted完成，选择视图面板才mounted
         this.mountCounter.enroll(this.model.embeddedAppDEViewId);
+    }
+    updateContextParams(opts) {
+        super.updateContextParams(opts);
         this.initNavParam();
     }
     /**

package/out/interface/common/i-global-config/i-global-config.d.ts

@@ -11,6 +11,14 @@ import { IGlobalViewConfig } from './i-global-view-config';
  * @interface IGlobalConfig
  */
 export interface IGlobalConfig {
+    /**
+     * 设置应用主题
+     *
+     * @author chitanda
+     * @date 2023-10-30 21:10:01
+     * @type {string}
+     */
+    theme?: string;
     /**
      * 全局视图配置
      * @return {*}

package/out/interface/common/i-global-config/i-global-config.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"i-global-config.d.ts","sourceRoot":"","sources":["../../../../src/interface/common/i-global-config/i-global-config.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,qBAAqB,EAAE,MAAM,4BAA4B,CAAC;AACnE,OAAO,EAAE,iBAAiB,EAAE,MAAM,wBAAwB,CAAC;AAC3D,OAAO,EAAE,oBAAoB,EAAE,MAAM,4BAA4B,CAAC;AAClE,OAAO,EAAE,iBAAiB,EAAE,MAAM,wBAAwB,CAAC;AAE3D;;;;;;;GAOG;AACH,MAAM,WAAW,aAAa;IAC5B;;;;OAIG;IACH,IAAI,EAAE,iBAAiB,CAAC;IAExB;;;;OAIG;IACH,IAAI,EAAE,iBAAiB,CAAC;IAExB;;;;OAIG;IACH,OAAO,EAAE,oBAAoB,CAAC;IAE9B;;;;OAIG;IACH,QAAQ,EAAE,qBAAqB,CAAC;CACjC"}
+{"version":3,"file":"i-global-config.d.ts","sourceRoot":"","sources":["../../../../src/interface/common/i-global-config/i-global-config.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,qBAAqB,EAAE,MAAM,4BAA4B,CAAC;AACnE,OAAO,EAAE,iBAAiB,EAAE,MAAM,wBAAwB,CAAC;AAC3D,OAAO,EAAE,oBAAoB,EAAE,MAAM,4BAA4B,CAAC;AAClE,OAAO,EAAE,iBAAiB,EAAE,MAAM,wBAAwB,CAAC;AAE3D;;;;;;;GAOG;AACH,MAAM,WAAW,aAAa;IAC5B;;;;;;OAMG;IACH,KAAK,CAAC,EAAE,MAAM,CAAC;IAEf;;;;OAIG;IACH,IAAI,EAAE,iBAAiB,CAAC;IAExB;;;;OAIG;IACH,IAAI,EAAE,iBAAiB,CAAC;IAExB;;;;OAIG;IACH,OAAO,EAAE,oBAAoB,CAAC;IAE9B;;;;OAIG;IACH,QAAQ,EAAE,qBAAqB,CAAC;CACjC"}

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

@@ -41,5 +41,16 @@ export interface IControlController<T extends IControl = IControl, S extends ICo
      * @date 2022-09-19 14:09:09
      */
     endLoading(): Promise<void>;
+    /**
+     * 在不改变引用的前提下，更新上下文和导航参数
+     * 并处理如自定义导航参数的后续处理
+     * @author lxm
+     * @date 2023-10-27 01:47:59
+     * @param {{ context?: IContext; params?: IParams }} opts
+     */
+    updateContextParams(opts: {
+        context?: IContext;
+        params?: IParams;
+    }): void;
 }
 //# sourceMappingURL=i-control.controller.d.ts.map

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

@@ -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,aAAa,EAAE,MAAM,aAAa,CAAC;AAC5C,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;AAE9E;;;;;;;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;;;;;OAKG;IACH,YAAY,IAAI,OAAO,CAAC,IAAI,CAAC,CAAC;IAE9B;;;;;OAKG;IACH,UAAU,IAAI,OAAO,CAAC,IAAI,CAAC,CAAC;CAC7B"}
+{"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,aAAa,EAAE,MAAM,aAAa,CAAC;AAC5C,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;AAE9E;;;;;;;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;;;;;OAKG;IACH,YAAY,IAAI,OAAO,CAAC,IAAI,CAAC,CAAC;IAE9B;;;;;OAKG;IACH,UAAU,IAAI,OAAO,CAAC,IAAI,CAAC,CAAC;IAE5B;;;;;;OAMG;IACH,mBAAmB,CAAC,IAAI,EAAE;QAAE,OAAO,CAAC,EAAE,QAAQ,CAAC;QAAC,MAAM,CAAC,EAAE,OAAO,CAAA;KAAE,GAAG,IAAI,CAAC;CAC3E"}

package/out/service/utils/res-path/res-path.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"res-path.d.ts","sourceRoot":"","sources":["../../../../src/service/utils/res-path/res-path.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,cAAc,EAAE,MAAM,kBAAkB,CAAC;AAKlD;;;;;;;;;;;;GAYG;AACH,wBAAgB,eAAe,CAC7B,OAAO,EAAE,OAAO,EAChB,MAAM,EAAE,cAAc,GACrB;IAAE,IAAI,EAAE,MAAM,CAAC;IAAC,IAAI,EAAE,MAAM,EAAE,CAAA;CAAE,GAAG,SAAS,CAgC9C;AAED;;;;;;;;;GASG;AACH,wBAAgB,WAAW,CAAC,OAAO,EAAE,OAAO,EAAE,MAAM,EAAE,cAAc,GAAG,MAAM,CAkB5E"}
+{"version":3,"file":"res-path.d.ts","sourceRoot":"","sources":["../../../../src/service/utils/res-path/res-path.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,cAAc,EAAE,MAAM,kBAAkB,CAAC;AAKlD;;;;;;;;;;;;GAYG;AACH,wBAAgB,eAAe,CAC7B,OAAO,EAAE,OAAO,EAChB,MAAM,EAAE,cAAc,GACrB;IAAE,IAAI,EAAE,MAAM,CAAC;IAAC,IAAI,EAAE,MAAM,EAAE,CAAA;CAAE,GAAG,SAAS,CAkC9C;AAED;;;;;;;;;GASG;AACH,wBAAgB,WAAW,CAAC,OAAO,EAAE,OAAO,EAAE,MAAM,EAAE,cAAc,GAAG,MAAM,CAkB5E"}

package/out/service/utils/res-path/res-path.js

@@ -1,5 +1,5 @@
 // 匹配 ${} 中间的内容
-const reg = /(?<=\$\{)(.*?)(?=\})/g;
+const reg = /\$\{(.*?)\}/g;
 /**
  * 获取匹配的资源路径
  * - 没匹配返回undefined
@@ -17,9 +17,11 @@ export function getMatchResPath(context, entity) {
     const pathItems = entity.requestPaths || [];
     // 获取所有的路径需要匹配的参数
     const items = pathItems.map(str => {
+        const match = str.match(reg);
+        const keys = (match === null || match === void 0 ? void 0 : match.map(item => item.substring(2, item.length - 1))) || [];
         return {
             path: str,
-            keys: str.match(reg) || [],
+            keys,
         };
     });
     // 过滤掉所有不能满足填充的路径, 并且按照填充参数个数排序，填充参数最多的优先依次递减排序

package/out/service/vo/control.vo.js

@@ -44,10 +44,10 @@ export class ControlVO {
             if (Object.prototype.hasOwnProperty.call(this.$origin, key)) {
                 Object.defineProperty(this, key, {
                     get() {
-                        return this.$origin.srfkey;
+                        return this.$origin[key];
                     },
                     set(val) {
-                        this.$origin.srfkey = val;
+                        this.$origin[key] = val;
                     },
                     enumerable: false,
                     configurable: true,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@ibiz-template/runtime",
-  "version": "0.2.5",
+  "version": "0.2.7",
   "description": "控制器包",
   "type": "module",
   "main": "out/index.js",
@@ -29,7 +29,7 @@
   "author": "chitanda",
   "license": "MIT",
   "devDependencies": {
-    "@ibiz-template/core": "^0.2.4",
+    "@ibiz-template/core": "^0.2.6",
     "@ibiz/model-core": "^0.0.19",
     "@types/path-browserify": "^1.0.0",
     "@types/qs": "^6.9.8",
@@ -59,5 +59,5 @@
     "qx-util": "^0.4.8",
     "ramda": "^0.29.0"
   },
-  "gitHead": "fab2e0edf52082dcbd450b48716dac8b63809b3f"
+  "gitHead": "2533d04e6de6b0d5b20759a0bb3951491c520ca3"
 }

package/src/controller/common/control/control.controller.ts

@@ -1,5 +1,10 @@
-import { IControl, IControlLogic, IViewLayoutPanel } from '@ibiz/model-core';
-import { NoticeError } from '@ibiz-template/core';
+import {
+  IControl,
+  IControlLogic,
+  IMDControl,
+  IViewLayoutPanel,
+} from '@ibiz/model-core';
+import { IBizContext, IBizParams, NoticeError } from '@ibiz-template/core';
 import { isNil } from 'ramda';
 import { notNilEmpty } from 'qx-util';
 import { BaseController } from '..';
@@ -82,6 +87,8 @@ export class ControlController<
    */
   providers: { [key: string]: IProvider } = {};
 
+  declare params: IBizParams;
+
   /**
    * Creates an instance of ControlController.
    *
@@ -92,7 +99,12 @@ export class ControlController<
    * @param {IParams} [params={}]
    */
   constructor(model: T, context: IContext, params: IParams, ctx: CTX) {
-    super(model, context, params, ctx);
+    super(
+      model,
+      IBizContext.create({}, context),
+      new IBizParams({}, params),
+      ctx,
+    );
     this.registerToCtx();
     const panelModel = ibiz.util.layoutPanel.get(
       `${model.controlType}_DEFAULT`,
@@ -100,6 +112,8 @@ export class ControlController<
     if (panelModel) {
       this.controlPanel = panelModel;
     }
+
+    this.updateContextParams({});
   }
 
   /**
@@ -170,6 +184,39 @@ export class ControlController<
     if (this.scheduler) {
       this.scheduler.destroy();
     }
+    this.params.destroy();
+  }
+
+  /**
+   * 处理上下文和导航参数相关的，如自定义导航参数的处理
+   *
+   * @author lxm
+   * @date 2022-09-08 15:09:47
+   * @protected
+   */
+  updateContextParams(opts: { context?: IContext; params?: IParams }): void {
+    // 不改变引用的情况下，重置控制器里的上下文和视图参数。
+    if (opts.context) {
+      this.context.reset({}, opts.context);
+    }
+    if (opts.params) {
+      this.params.reset({}, opts.params);
+    }
+
+    const { controlNavContexts, controlNavParams } = this.model as IMDControl;
+    // 处理自定义导航上下文
+    let context = {};
+    if (notNilEmpty(controlNavContexts)) {
+      context = convertNavData(controlNavContexts!, this.params, this.context);
+    }
+    Object.assign(this.context, context);
+
+    // 处理自定义视图参数
+    let params = {};
+    if (notNilEmpty(controlNavParams)) {
+      params = convertNavData(controlNavParams!, this.params, this.context);
+    }
+    Object.assign(this.params, params);
   }
 
   /**

package/src/controller/common/control/md-control.controller.ts

@@ -228,6 +228,10 @@ export class MDControlController<
       await this.endLoading();
     }
 
+    this.state.items.forEach((item, index) => {
+      item.srfserialnum = index + 1;
+    });
+
     this.actionNotification('FETCHSUCCESS');
     return this.state.items;
   }

package/src/controller/control/chart/generator/chart-options-generator.ts

@@ -4,6 +4,7 @@ import type {
   XAXisComponentOption,
   YAXisComponentOption,
   ECElementEvent,
+  LegendComponentOption,
 } from 'echarts';
 import {
   IAppDataEntity,
@@ -207,10 +208,6 @@ export class ChartOptionsGenerator {
     const { showLegend, legendPos } = chartLegend;
     const legendOption: EChartsOption['legend'] = {};
     legendOption.show = showLegend;
-    // 图表单序列不应出图例
-    if (this.model.dechartSerieses?.length === 1) {
-      legendOption.show = false;
-    }
     const position = legendPos?.toLowerCase();
     if (position === 'left' || position === 'right') {
       legendOption.left = position;
@@ -365,6 +362,18 @@ export class ChartOptionsGenerator {
     });
     this.options.series = seriesOption;
 
+    // 柱状图、折线图、散点图单个序列并且该序列分组数据只有一条时，不用显示图例
+    if (
+      this.seriesGenerators.length === 1 &&
+      this.seriesGenerators[0].groupData &&
+      Object.keys(this.seriesGenerators[0].groupData).length === 1 &&
+      seriesOption[0].type &&
+      ['bar', 'line', 'scatter'].includes(seriesOption[0].type) &&
+      this.staticOptions.legend
+    ) {
+      (this.staticOptions.legend as LegendComponentOption).show = false;
+    }
+
     // 合并静态和动态的options
     this.options = mergeDeepRight(
       this.staticOptions,

package/src/controller/control/chart/generator/funnel-series-generator.ts

@@ -2,6 +2,11 @@ import { IChartSeriesFunnel } from '@ibiz/model-core';
 import type { ECElementEvent, FunnelSeriesOption, SeriesOption } from 'echarts';
 import { BaseSeriesGenerator, CatalogData } from './base-series-generator';
 
+interface funnelSeriesData {
+  name: string;
+  value: IData[];
+}
+
 /**
  * 漏斗图序列生成器
  * @author lxm
@@ -20,14 +25,15 @@ export class FunnelSeriesGenerator extends BaseSeriesGenerator<IChartSeriesFunne
     return options;
   }
 
-  protected calcSeriesData(catalogData: CatalogData): {
-    name: string;
-    value: IData[];
-  }[] {
-    return Object.keys(catalogData).map(catalog => {
-      const data = catalogData.get(catalog)!;
-      return { name: catalog, value: [data.value, data.deData?.srfkey] };
+  protected calcSeriesData(catalogData: CatalogData): funnelSeriesData[] {
+    const temData: funnelSeriesData[] = [];
+    catalogData.forEach((catalog, key) => {
+      temData.push({
+        name: key,
+        value: [catalog.value, catalog.deData?.srfkey],
+      });
     });
+    return temData;
   }
 
   getSrfkeyByParams(params: ECElementEvent): string {

package/src/controller/control/chart/generator/pie-series-generator.ts

@@ -2,6 +2,11 @@ import { IChartSeriesPie } from '@ibiz/model-core';
 import type { ECElementEvent, PieSeriesOption, SeriesOption } from 'echarts';
 import { BaseSeriesGenerator, CatalogData } from './base-series-generator';
 
+interface pieSeriesData {
+  name: string;
+  value: IData[];
+}
+
 /**
  * 饼图序列生成器
  * @author lxm
@@ -20,14 +25,15 @@ export class PieSeriesGenerator extends BaseSeriesGenerator<IChartSeriesPie> {
     return options;
   }
 
-  protected calcSeriesData(catalogData: CatalogData): {
-    name: string;
-    value: IData[];
-  }[] {
-    return Object.keys(catalogData).map(catalog => {
-      const data = catalogData.get(catalog)!;
-      return { name: catalog, value: [data.value, data.deData?.srfkey] };
+  protected calcSeriesData(catalogData: CatalogData): pieSeriesData[] {
+    const temData: pieSeriesData[] = [];
+    catalogData.forEach((catalog, key) => {
+      temData.push({
+        name: key,
+        value: [catalog.value, catalog.deData?.srfkey],
+      });
     });
+    return temData;
   }
 
   getSrfkeyByParams(params: ECElementEvent): string {

package/src/controller/control/chart/generator/radar-series-generator.ts

@@ -5,7 +5,7 @@ import { BaseSeriesGenerator, DEFAULT_GROUP } from './base-series-generator';
 import { RadarCoordSystem } from './radar-coord-system';
 
 /**
- * 饼图序列生成器
+ * 雷达序列生成器
  * @author lxm
  * @date 2023-06-11 06:19:03
  * @export
@@ -39,8 +39,8 @@ export class RadarSeriesGenerator extends BaseSeriesGenerator<IChartSeriesRadar>
 
     // 更新雷达坐标系指示器和最大值
     Object.values(groupData).forEach(catalogData => {
-      Object.keys(catalogData).forEach(catalog => {
-        radar.updateIndicator(catalog, catalogData.get(catalog)!.value);
+      catalogData.forEach((catalog, key) => {
+        radar.updateIndicator(key, catalog.value);
       });
     });
   }

package/src/controller/control/dashboard/dashboard.controller.ts

@@ -84,9 +84,19 @@ export class DashboardController
     if (!portletModels?.length) {
       return;
     }
+    // 这块只初始化子门户部件，忽略子门户部件里面嵌入的部件
+    const ignorePortletTypes: string[] = [
+      ControlType.CHART,
+      ControlType.APP_MENU,
+      ControlType.TOOLBAR,
+      ControlType.LIST,
+    ];
     await Promise.all(
       portletModels.map(async portlet => {
-        if (portlet.controlType === ControlType.CHART) {
+        if (
+          portlet.controlType &&
+          ignorePortletTypes.includes(portlet.controlType)
+        ) {
           return;
         }
         const provider = await getPortletProvider(portlet);

package/src/controller/control/dashboard/portlet/actionbar-portlet/actionbar-portlet.controller.ts

@@ -0,0 +1,4 @@
+import { IDBToolbarPortlet } from '@ibiz/model-core';
+import { PortletPartController } from '../portlet-part/portlet-part.controller';
+
+export class ActionBarPortletController extends PortletPartController<IDBToolbarPortlet> {}

package/src/controller/control/dashboard/portlet/actionbar-portlet/index.ts

@@ -0,0 +1 @@
+export * from './actionbar-portlet.controller';

package/src/controller/control/dashboard/portlet/html-portlet/html-portlet.controller.ts

@@ -0,0 +1,4 @@
+import { IDBHtmlPortletPart } from '@ibiz/model-core';
+import { PortletPartController } from '../portlet-part/portlet-part.controller';
+
+export class HtmlPortletController extends PortletPartController<IDBHtmlPortletPart> {}

package/src/controller/control/dashboard/portlet/html-portlet/index.ts

@@ -0,0 +1 @@
+export * from './html-portlet.controller';

package/src/controller/control/dashboard/portlet/index.ts

@@ -3,3 +3,7 @@ export * from './container-portlet';
 export * from './view-portlet';
 export * from './menu-portlet';
 export * from './chart-portlet';
+export * from './actionbar-portlet';
+export * from './html-portlet';
+export * from './list-portlet';
+export * from './rawitem-portlet';

package/src/controller/control/dashboard/portlet/list-portlet/index.ts

@@ -0,0 +1 @@
+export * from './list-portlet.controller';

package/src/controller/control/dashboard/portlet/list-portlet/list-portlet.controller.ts

@@ -0,0 +1,4 @@
+import { IDBListPortletPart } from '@ibiz/model-core';
+import { PortletPartController } from '../portlet-part/portlet-part.controller';
+
+export class ListPortletController extends PortletPartController<IDBListPortletPart> {}

package/src/controller/control/dashboard/portlet/rawitem-portlet/index.ts

@@ -0,0 +1 @@
+export * from './rawitem-portlet.controller';

package/src/controller/control/dashboard/portlet/rawitem-portlet/rawitem-portlet.controller.ts

@@ -0,0 +1,4 @@
+import { IDBRawItemPortletPart } from '@ibiz/model-core';
+import { PortletPartController } from '../portlet-part/portlet-part.controller';
+
+export class RawItemPortletController extends PortletPartController<IDBRawItemPortletPart> {}

package/src/controller/control/form/form-detail/form-detail/form-detail.controller.ts

@@ -7,8 +7,8 @@ import {
 import { calcLayoutHeightWidth, calcDynaClass } from '../../../../../model';
 import { verifyFormGroupLogic } from '../../../../../utils';
 import { FormNotifyState } from '../../../../constant';
-import { FormController } from '../../form/form.controller';
 import { FormDetailState } from './form-detail.state';
+import { FormController } from '../../form';
 
 export class FormDetailController<T extends IDEFormDetail = IDEFormDetail>
   implements IFormDetailController
@@ -45,7 +45,7 @@ export class FormDetailController<T extends IDEFormDetail = IDEFormDetail>
    *
    * @author lxm
    * @date 2022-08-24 22:08:59
-   * @type {FormController}
+   * @type {IFormDetailContainerController}
    */
   readonly parent?: IFormDetailContainerController;