npm - @ibiz-template/runtime - Versions diffs - 0.7.19 → 0.7.21 - Mend

@ibiz-template/runtime 0.7.19 → 0.7.21

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

Files changed (92) hide show

package/out/controller/control/form/form-detail/form-mdctrl/form-mdctrl.controller.d.ts.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"form-mdctrl.controller.d.ts","sourceRoot":"","sources":["../../../../../../src/controller/control/form/form-detail/form-mdctrl/form-mdctrl.controller.ts"],"names":[],"mappings":"~~AACA~~,OAAO,EAAE,aAAa,EAAE,oBAAoB,EAAE,MAAM,kBAAkB,CAAC;AACvE,OAAO,EAAE,oBAAoB,EAAE,MAAM,gBAAgB,CAAC;AACtD,OAAO,EAAE,eAAe,EAAE,MAAM,qBAAqB,CAAC;AAEtD,OAAO,EAAE,eAAe,EAAE,MAAM,sBAAsB,CAAC;~~AAGvD~~;;;;;;;;GAQG;AACH,qBAAa,oBAAqB,SAAQ,oBAAoB,CAAC,aAAa,CAAC;IAC3E;;;;;;OAMG;IACK,KAAK,EAAE,eAAe,CAAC;IAE/B,SAAS,CAAC,WAAW,IAAI,eAAe;IAIxC;;;;;;OAMG;IACH,IAAI,IAAI,IAAI,MAAM,CAEjB;IAED;;;;;;OAMG;IACH,IAAI,OAAO,IAAI,QAAQ,CAEtB;IAED;;;;;;OAMG;IACH,IAAI,MAAM,IAAI,OAAO,CAEpB;IAED;;;;;;;OAOG;IACH,IAAI,YAAY,IAAI,OAAO,CAK1B;IAED;;;;;;;OAOG;IACH,IAAI,YAAY,IAAI,OAAO,CAK1B;IAED;;;;;;OAMG;IACH,IAAI,YAAY,IAAI,OAAO,CAK1B;IAED;;;;;OAKG;IACG,cAAc,IAAI,OAAO,CAAC,IAAI,CAAC;IAM/B,eAAe,CAAC,KAAK,EAAE,eAAe,GAAG,OAAO,CAAC,IAAI,CAAC;IAS5D;;;;;;;OAOG;cACa,MAAM,IAAI,OAAO,CAAC,IAAI,CAAC;IAKjC,gBAAgB,IAAI,OAAO,CAAC,IAAI,CAAC;IAsBvC;;;;;;;OAOG;IACG,aAAa,CACjB,MAAM,EAAE,oBAAoB,EAC5B,KAAK,EAAE,UAAU,GAChB,OAAO,CAAC,IAAI,CAAC;IAgBhB;;;;OAIG;IACH,OAAO,IAAI,IAAI;IAIf;;;;;OAKG;IACG,QAAQ,IAAI,OAAO,CAAC,OAAO,CAAC;~~CAInC~~"}
1	+ {"version":3,"file":"form-mdctrl.controller.d.ts","sourceRoot":"","sources":["../../../../../../src/controller/control/form/form-detail/form-mdctrl/form-mdctrl.controller.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,aAAa,EAAE,oBAAoB,EAAE,MAAM,kBAAkB,CAAC;AACvE,OAAO,EAAE,oBAAoB,EAAE,MAAM,gBAAgB,CAAC;AACtD,OAAO,EAAE,eAAe,EAAE,MAAM,qBAAqB,CAAC;AAEtD,OAAO,EAAE,eAAe,EAAE,MAAM,sBAAsB,CAAC;AAEvD,OAAO,EAAE,cAAc,EAAE,MAAM,0BAA0B,CAAC;AAE1D;;;;;;;;GAQG;AACH,qBAAa,oBAAqB,SAAQ,oBAAoB,CAAC,aAAa,CAAC;IAC3E;;;;;;OAMG;IACK,KAAK,EAAE,eAAe,CAAC;IAE/B,SAAS,CAAC,WAAW,IAAI,eAAe;IAIxC;;;;;;OAMG;IACH,IAAI,IAAI,IAAI,MAAM,CAEjB;IAED;;;;;;OAMG;IACH,IAAI,OAAO,IAAI,QAAQ,CAEtB;IAED;;;;;;OAMG;IACH,IAAI,MAAM,IAAI,OAAO,CAEpB;IAED;;;;;;;OAOG;IACH,IAAI,YAAY,IAAI,OAAO,CAK1B;IAED;;;;;;;OAOG;IACH,IAAI,YAAY,IAAI,OAAO,CAK1B;IAED;;;;;;OAMG;IACH,IAAI,YAAY,IAAI,OAAO,CAK1B;IAED;;;;;OAKG;IACG,cAAc,IAAI,OAAO,CAAC,IAAI,CAAC;IAM/B,eAAe,CAAC,KAAK,EAAE,eAAe,GAAG,OAAO,CAAC,IAAI,CAAC;IAS5D;;;;;;;OAOG;cACa,MAAM,IAAI,OAAO,CAAC,IAAI,CAAC;IAKjC,gBAAgB,IAAI,OAAO,CAAC,IAAI,CAAC;IAsBvC;;;;;;;OAOG;IACG,aAAa,CACjB,MAAM,EAAE,oBAAoB,EAC5B,KAAK,EAAE,UAAU,GAChB,OAAO,CAAC,IAAI,CAAC;IAgBhB;;;;OAIG;IACH,OAAO,IAAI,IAAI;IAIf;;;;;OAKG;IACG,QAAQ,IAAI,OAAO,CAAC,OAAO,CAAC;IAKlC;;;;;;OAMG;IACG,IAAI,CAAC,IAAI,CAAC,EAAE,cAAc,GAAG,OAAO,CAAC,IAAI,CAAC;CACjD"}

package/out/controller/control/form/form-detail/form-mdctrl/form-mdctrl.controller.js CHANGED Viewed

@@ -1,3 +1,4 @@
+/* eslint-disable @typescript-eslint/no-unused-vars */
 import { BitMask } from '@ibiz-template/core';
 import { FormDetailController } from '../form-detail';
 import { FormMDCtrlState } from './form-mdctrl.state';
@@ -167,4 +168,12 @@ export class FormMDCtrlController extends FormDetailController {
         // todo 子类校验实现
         return true;
     }
+    /**
+     * 保存
+     * 子类实现
+     * @param {FormSaveParams} [args]
+     * @return {*}  {Promise<void>}
+     * @memberof FormMDCtrlController
+     */
+    async save(args) { }
 }

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

@@ -266,11 +266,11 @@ export class GanttController extends TreeGridExController {
      */
     async modifyNodeTime(nodeData, { begin, end }) {
         if (nodeData._nodeType !== 'DE') {
-            throw new RuntimeError(ibiz.i18n.t('runtime.controller.control.md.noNode'));
+            throw new RuntimeError(ibiz.i18n.t('runtime.controller.control.gantt.noNode'));
         }
         const rowState = this.getRowState(nodeData._id);
         if (!rowState) {
-            throw new RuntimeError(ibiz.i18n.t('runtime.controller.control.md.rowData'));
+            throw new RuntimeError(ibiz.i18n.t('runtime.controller.common.md.rowData'));
         }
         const { beginDataItemName, endDataItemName } = this.model;
         this.setRowValue(rowState, beginDataItemName, begin);
@@ -286,18 +286,18 @@ export class GanttController extends TreeGridExController {
      */
     async save(nodeData) {
         if (this.state.isSimple) {
-            ibiz.log.debug(ibiz.i18n.t('runtime.controller.control.md.simpleMode'));
+            ibiz.log.debug(ibiz.i18n.t('runtime.controller.common.md.simpleMode'));
             return;
         }
         if (nodeData._nodeType !== 'DE') {
-            throw new RuntimeError(ibiz.i18n.t('runtime.controller.control.md.nonentity'));
+            throw new RuntimeError(ibiz.i18n.t('runtime.controller.control.gantt.nonentity'));
         }
         const rowState = this.state.rows[nodeData._uuid];
         if (!rowState) {
-            throw new RuntimeError(ibiz.i18n.t('runtime.controller.control.md.rowData'));
+            throw new RuntimeError(ibiz.i18n.t('runtime.controller.common.md.rowData'));
         }
         if (!rowState.modified) {
-            ibiz.log.debug(ibiz.i18n.t('runtime.controller.control.md.noChange'));
+            ibiz.log.debug(ibiz.i18n.t('runtime.controller.common.md.noChange'));
             return;
         }
         // 如果数据正在处理中，则延迟保存
@@ -390,7 +390,7 @@ export class GanttController extends TreeGridExController {
             if ((args === null || args === void 0 ? void 0 : args.silent) !== true) {
                 this.actionNotification('REMOVESUCCESS', {
                     data,
-                    default: ibiz.i18n.t('runtime.controller.control.md.dataDeleted', {
+                    default: ibiz.i18n.t('runtime.controller.common.md.dataDeleted', {
                         str: data.map(item => item.srfmajortext).join('、'),
                     }),
                 });
@@ -456,7 +456,7 @@ export class GanttController extends TreeGridExController {
         if (editShowMode === 'row') {
             const editingRow = Object.values(this.state.rows).find(item => item.showRowEdit);
             if (editingRow) {
-                throw new RuntimeError(ibiz.i18n.t('runtime.controller.control.md.firstComplete'));
+                throw new RuntimeError(ibiz.i18n.t('runtime.controller.common.md.firstComplete'));
             }
         }
         let parentModel;

package/out/controller/control/gantt/gantt.service.d.ts.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"gantt.service.d.ts","sourceRoot":"","sources":["../../../../src/controller/control/gantt/gantt.service.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,mBAAmB,EACnB,kBAAkB,EAClB,WAAW,EACX,aAAa,EACd,MAAM,kBAAkB,CAAC;AAE1B,OAAO,~~EAAE~~,cAAc,EAAE,MAAM,oBAAoB,CAAC;~~AAGpD~~,OAAO,EAAE,aAAa,EAAE,WAAW,EAAE,MAAM,SAAS,CAAC;AAOrD;;;;;;;;GAQG;AACH,qBAAa,YAAa,SAAQ,WAAW;IAC3C;;;;;;;;;OASG;IACG,YAAY,CAChB,SAAS,EAAE,kBAAkB,EAC7B,MAAM,EAAE,aAAa,GAAG,SAAS,EACjC,cAAc,EAAE,cAAc,GAAG,SAAS,EAC1C,IAAI,EAAE,aAAa,GAClB,OAAO,CAAC,cAAc,CAAC;~~IA+B1B~~;;;;;;;;OAQG;IACG,eAAe,CACnB,cAAc,EAAE,cAAc,GAAG,SAAS,EAC1C,IAAI,EAAE,aAAa,GAClB,OAAO,CAAC,cAAc,EAAE,GAAG,SAAS,CAAC;IA8CxC;;;;;;;;;;;OAWG;cACa,oBAAoB,CAClC,SAAS,EAAE,WAAW,EACtB,MAAM,EAAE,aAAa,GAAG,SAAS,EACjC,cAAc,EAAE,cAAc,GAAG,SAAS,EAC1C,IAAI,EAAE,aAAa,GAClB,OAAO,CAAC,cAAc,EAAE,CAAC;IAsE5B;;;;;;;;;;;OAWG;cACa,sBAAsB,CACpC,SAAS,EAAE,WAAW,EACtB,MAAM,EAAE,aAAa,GAAG,SAAS,EACjC,cAAc,EAAE,cAAc,GAAG,SAAS,EAC1C,IAAI,EAAE,aAAa,GAClB,OAAO,CAAC,cAAc,CAAC;~~IAU1B~~;;;;;;;;;;;OAWG;cACa,mBAAmB,CACjC,SAAS,EAAE,kBAAkB,EAC7B,MAAM,EAAE,aAAa,GAAG,SAAS,EACjC,cAAc,EAAE,cAAc,GAAG,SAAS,EAC1C,IAAI,EAAE,aAAa,GAClB,OAAO,CAAC,cAAc,EAAE,CAAC;~~IA6C5B~~;;;;;;;;;;;OAWG;cACa,yBAAyB,CACvC,SAAS,EAAE,mBAAmB,EAC9B,MAAM,EAAE,aAAa,GAAG,SAAS,EACjC,cAAc,EAAE,cAAc,GAAG,SAAS,EAC1C,IAAI,EAAE,aAAa,GAClB,OAAO,CAAC,cAAc,EAAE,CAAC;~~CAmC7B~~"}
1	+ {"version":3,"file":"gantt.service.d.ts","sourceRoot":"","sources":["../../../../src/controller/control/gantt/gantt.service.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,mBAAmB,EACnB,kBAAkB,EAClB,WAAW,EACX,aAAa,EACd,MAAM,kBAAkB,CAAC;AAE1B,OAAO,EAAgB,cAAc,EAAE,MAAM,oBAAoB,CAAC;AAGlE,OAAO,EAAE,aAAa,EAAE,WAAW,EAAE,MAAM,SAAS,CAAC;AAOrD;;;;;;;;GAQG;AACH,qBAAa,YAAa,SAAQ,WAAW;IAC3C;;;;;;;;;OASG;IACG,YAAY,CAChB,SAAS,EAAE,kBAAkB,EAC7B,MAAM,EAAE,aAAa,GAAG,SAAS,EACjC,cAAc,EAAE,cAAc,GAAG,SAAS,EAC1C,IAAI,EAAE,aAAa,GAClB,OAAO,CAAC,cAAc,CAAC;IAgC1B;;;;;;;;OAQG;IACG,eAAe,CACnB,cAAc,EAAE,cAAc,GAAG,SAAS,EAC1C,IAAI,EAAE,aAAa,GAClB,OAAO,CAAC,cAAc,EAAE,GAAG,SAAS,CAAC;IA8CxC;;;;;;;;;;;OAWG;cACa,oBAAoB,CAClC,SAAS,EAAE,WAAW,EACtB,MAAM,EAAE,aAAa,GAAG,SAAS,EACjC,cAAc,EAAE,cAAc,GAAG,SAAS,EAC1C,IAAI,EAAE,aAAa,GAClB,OAAO,CAAC,cAAc,EAAE,CAAC;IAsE5B;;;;;;;;;;;OAWG;cACa,sBAAsB,CACpC,SAAS,EAAE,WAAW,EACtB,MAAM,EAAE,aAAa,GAAG,SAAS,EACjC,cAAc,EAAE,cAAc,GAAG,SAAS,EAC1C,IAAI,EAAE,aAAa,GAClB,OAAO,CAAC,cAAc,CAAC;IAe1B;;;;;;;;;;;OAWG;cACa,mBAAmB,CACjC,SAAS,EAAE,kBAAkB,EAC7B,MAAM,EAAE,aAAa,GAAG,SAAS,EACjC,cAAc,EAAE,cAAc,GAAG,SAAS,EAC1C,IAAI,EAAE,aAAa,GAClB,OAAO,CAAC,cAAc,EAAE,CAAC;IA+C5B;;;;;;;;;;;OAWG;cACa,yBAAyB,CACvC,SAAS,EAAE,mBAAmB,EAC9B,MAAM,EAAE,aAAa,GAAG,SAAS,EACjC,cAAc,EAAE,cAAc,GAAG,SAAS,EAC1C,IAAI,EAAE,aAAa,GAClB,OAAO,CAAC,cAAc,EAAE,CAAC;CAqC7B"}

package/out/controller/control/gantt/gantt.service.js CHANGED Viewed

@@ -45,6 +45,7 @@ export class GanttService extends TreeService {
             leaf: true,
             navContext,
             navParams,
+            defaultExpand: false,
         });
     }
     /**
@@ -118,7 +119,7 @@ export class GanttService extends TreeService {
                 result = await this.getCodeListGanttNodeDatas(nodeModel, nodeRS, parentNodeData, tempOpts);
                 break;
             default:
-                throw new ModelError(nodeModel, ibiz.i18n.t('runtime.controller.control.md.noSupport', {
+                throw new ModelError(nodeModel, ibiz.i18n.t('runtime.controller.control.gantt.noSupport', {
                     treeNodeType: nodeModel.treeNodeType,
                 }));
         }
@@ -150,7 +151,12 @@ export class GanttService extends TreeService {
      * @return {*}  {Promise<IGanttNodeData>}
      */
     async getStaticGanttNodeData(nodeModel, nodeRS, parentNodeData, opts) {
-        const nodeData = new GanttStaticNodeData(this.model, nodeModel, parentNodeData, { parentValueLevel: nodeRS === null || nodeRS === void 0 ? void 0 : nodeRS.parentValueLevel, leaf: !!opts.leaf });
+        const defaultExpand = this.calcStaticExpand(nodeModel);
+        const nodeData = new GanttStaticNodeData(this.model, nodeModel, parentNodeData, {
+            parentValueLevel: nodeRS === null || nodeRS === void 0 ? void 0 : nodeRS.parentValueLevel,
+            leaf: !!opts.leaf,
+            defaultExpand,
+        });
         return nodeData;
     }
     /**
@@ -187,12 +193,14 @@ export class GanttService extends TreeService {
         // 请求实体数据
         const response = await this.app.deService.exec(appDataEntityId, appDEDataSetId, context, params);
         if (response.data.length) {
-            const nodeDatas = response.data.map((item) => {
+            const nodeDatas = response.data.map((item, index) => {
+                const defaultExpand = this.calcExpand(nodeModel, index);
                 return new GanttDataSetNodeData(this.model, nodeModel, parentNodeData, {
                     data: item,
                     leaf: !!opts.leaf,
                     navContext,
                     navParams,
+                    defaultExpand,
                 });
             });
             return nodeDatas;
@@ -224,12 +232,14 @@ export class GanttService extends TreeService {
         // 请求实体数据
         const items = await this.app.codeList.get(nodeModel.codeListId, context, params);
         if (items.length) {
-            const nodeDatas = items.map(item => {
+            const nodeDatas = items.map((item, index) => {
+                const defaultExpand = this.calcExpand(nodeModel, index);
                 return new GanttCodeListNodeData(this.model, nodeModel, parentNodeData, {
                     data: item,
                     leaf: !!opts.leaf,
                     navContext,
                     navParams,
+                    defaultExpand,
                 });
             });
             return nodeDatas;

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

	@@ -1 +1 @@
1	- {"version":3,"file":"grid.controller.d.ts","sourceRoot":"","sources":["../../../../../src/controller/control/grid/grid/grid.controller.ts"],"names":[],"mappings":"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~~IAe3B~~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"}
1	+ {"version":3,"file":"grid.controller.d.ts","sourceRoot":"","sources":["../../../../../src/controller/control/grid/grid/grid.controller.ts"],"names":[],"mappings":"AAWA,OAAO,EACL,OAAO,EAEP,aAAa,EACb,aAAa,EACd,MAAM,kBAAkB,CAAC;AAG1B,OAAO,EAAE,yBAAyB,EAAE,MAAM,+DAA+D,CAAC;AAC1G,OAAO,EAAE,oBAAoB,EAAE,MAAM,0BAA0B,CAAC;AAChE,OAAO,EAAE,YAAY,EAAE,MAAM,kBAAkB,CAAC;AAChD,OAAO,EAAE,WAAW,EAAE,MAAM,gBAAgB,CAAC;AAC7C,OAAO,EACL,6BAA6B,EAC7B,sBAAsB,EACvB,MAAM,gBAAgB,CAAC;AACxB,OAAO,EACL,UAAU,EACV,UAAU,EACV,eAAe,EACf,mBAAmB,EACnB,YAAY,EACZ,gBAAgB,EAChB,aAAa,EACb,aAAa,EACb,YAAY,EACZ,gBAAgB,EAEjB,MAAM,uBAAuB,CAAC;AAG/B,OAAO,EAAE,SAAS,EAAS,MAAM,qBAAqB,CAAC;AACvD,OAAO,EAAE,mBAAmB,EAAE,MAAM,iBAAiB,CAAC;AACtD,OAAO,EAAE,eAAe,EAAE,MAAM,mBAAmB,CAAC;AACpD,OAAO,EACL,eAAe,EAKhB,MAAM,gBAAgB,CAAC;AAIxB;;;;;;;;GAQG;AACH,qBAAa,cAAc,CACvB,CAAC,SAAS,OAAO,GAAG,OAAO,EAC3B,CAAC,SAAS,UAAU,GAAG,UAAU,EACjC,CAAC,SAAS,UAAU,GAAG,UAAU,CAEnC,SAAQ,mBAAmB,CAAC,CAAC,EAAE,CAAC,EAAE,CAAC,CACnC,YAAW,eAAe,CAAC,CAAC,EAAE,CAAC,EAAE,CAAC,CAAC;IAEnC;;;;;;OAMG;IACK,OAAO,EAAE,WAAW,CAAC;IAE7B,SAAS,KAAK,IAAI,IAAI,eAAe,CAAC,UAAU,CAAC,CAEhD;IAED;;;;;OAKG;IACH,iBAAiB,EAAE,OAAO,CAAS;IAEnC;;;;;OAKG;IACH,kBAAkB,EAAE,OAAO,CAAS;IAEpC;;;;;OAKG;IACH,eAAe,EAAE,OAAO,CAAS;IAEjC;;;;;;OAMG;IACH,OAAO,EAAE;QAAE,CAAC,GAAG,EAAE,MAAM,GAAG,oBAAoB,CAAA;KAAE,CAAM;IAEtD;;;;;;OAMG;IACH,YAAY,EAAE;QAAE,CAAC,GAAG,EAAE,MAAM,GAAG,yBAAyB,CAAA;KAAE,CAAM;IAEhE;;;;;;OAMG;IACH,SAAS,EAAE;QAAE,CAAC,GAAG,EAAE,MAAM,GAAG,sBAAsB,CAAA;KAAE,CAAM;IAE1D;;;;;;OAMG;IACH,WAAW,EAAE;QAAE,CAAC,GAAG,EAAE,MAAM,GAAG,6BAA6B,CAAA;KAAE,CAAM;IAEnE;;;;;;OAMG;IACH,SAAS,EAAE;QAAE,CAAC,GAAG,EAAE,MAAM,GAAG,mBAAmB,CAAA;KAAE,CAAM;IAEvD;;;;;OAKG;IACH,gBAAgB,CAAC,EAAE,yBAAyB,CAAC;IAE7C;;;;;OAKG;IACH,QAAQ,EAAE,MAAM,CAAQ;IAExB;;;;;OAKG;IACH,UAAU,EAAE,aAAa,GAAG,SAAS,CAAC;IAEtC;;;;;OAKG;IACH,eAAe,EAAE,KAAK,CAAM;IAE5B;;;;;OAKG;IACH,gBAAgB,EAAE,aAAa,EAAE,CAAM;IAEvC;;;;;OAKG;IACH,oBAAoB,EAAE,GAAG,CAAC,MAAM,EAAE,SAAS,YAAY,EAAE,CAAC,CAAa;IAEvE;;;;;OAKG;IACH,IAAI,kBAAkB,IAAI,QAAQ,CAAC,YAAY,EAAE,CAAC,GAAG,SAAS,CAE7D;IAED;;;;;;OAMG;IACH,IAAI,SAAS,IAAI,OAAO,CAEvB;IAED;;;;;;OAMG;IACH,IAAI,YAAY,IAAI,OAAO,CAE1B;IAED;;;;;;OAMG;IACH,IAAI,kBAAkB,IAAI,OAAO,CAEhC;IAED;;;;;;OAMG;IACH,IAAI,YAAY,IAAI,MAAM,GAAG,UAAU,CAEtC;IAED,SAAS,CAAC,SAAS,IAAI,IAAI;IAc3B;;;;;;;OAOG;cACa,SAAS,IAAI,OAAO,CAAC,IAAI,CAAC;IAyB1C;;;;;OAKG;IAEH,YAAY,CAAC,SAAS,EAAE,KAAK,GAAG,IAAI;IA4BpC;;;;;OAKG;IACG,kBAAkB,IAAI,OAAO,CAAC,IAAI,CAAC;IAkCzC;;;;;;OAMG;cACa,cAAc,IAAI,OAAO,CAAC,IAAI,CAAC;IAuC/C;;;;;;OAMG;cACa,qBAAqB,IAAI,OAAO,CAAC,IAAI,CAAC;IA+BtD;;;;;;OAMG;cACa,SAAS,IAAI,OAAO,CAAC,IAAI,CAAC;IA8D1C;;;;;OAKG;IACH,SAAS,CAAC,KAAK,EAAE,KAAK,EAAE,GAAG,IAAI;IA2BzB,SAAS,CACb,IAAI,EAAE,gBAAgB,EACtB,KAAK,EAAE,SAAS,EAAE,GACjB,OAAO,CAAC,SAAS,EAAE,CAAC;IA+BvB;;;OAGG;IACG,UAAU,CAAC,IAAI,EAAE,aAAa,EAAE,GAAG,OAAO,CAAC,IAAI,CAAC;IAqBtD;;;;;;OAMG;IACH,SAAS,CAAC,aAAa,CAAC,KAAK,EAAE,KAAK,EAAE,GAAG,IAAI;IAmC7C;;;;;;OAMG;cACa,aAAa,IAAI,OAAO,CAAC,IAAI,CAAC;IA0BxC,cAAc,CAAC,WAAW,GAAE,OAAY,GAAG,OAAO,CAAC,OAAO,CAAC;IAOjE;;;;;;OAMG;IACH,SAAS,CAAC,aAAa,CAAC,KAAK,EAAE,KAAK,EAAE,GAAG,IAAI;IAS7C;;;;;;OAMG;IACH,WAAW,CAAC,IAAI,EAAE,KAAK,GAAG,IAAI;IAmB9B;;;;;OAKG;IACG,MAAM,IAAI,OAAO,CAAC,IAAI,CAAC;IAoD7B;;;;;;;OAOG;IACG,IAAI,CAAC,IAAI,EAAE,SAAS,GAAG,OAAO,CAAC,IAAI,CAAC;IAiEpC,OAAO,IAAI,OAAO,CAAC,IAAI,CAAC;IAe9B;;;;;;OAMG;cACa,qBAAqB,CAAC,MAAM,EAAE,aAAa,GAAG,OAAO,CAAC,IAAI,CAAC;IAmC3E;;;;;;OAMG;IACH,SAAS,CAAC,gBAAgB,IAAI,IAAI;IAuClC;;;;;OAKG;IACH,SAAS,CAAC,eAAe,IAAI,IAAI;IAqBjC;;;;;;OAMG;cACa,eAAe,IAAI,OAAO,CAAC,IAAI,CAAC;IAUhD;;;;;;;;OAQG;IACG,WAAW,CACf,GAAG,EAAE,YAAY,EACjB,IAAI,EAAE,MAAM,EACZ,KAAK,EAAE,OAAO,GACb,OAAO,CAAC,IAAI,CAAC;IAyBhB;;;;;;;OAOG;IACG,gBAAgB,CAAC,GAAG,EAAE,YAAY,EAAE,KAAK,EAAE,MAAM,EAAE,GAAG,OAAO,CAAC,IAAI,CAAC;IASzE;;;;;OAKG;IACH,eAAe,CAAC,GAAG,EAAE,YAAY,EAAE,KAAK,EAAE,eAAe,GAAG,IAAI;IAOhE;;;;;;;OAOG;IACG,QAAQ,CAAC,GAAG,EAAE,YAAY,GAAG,OAAO,CAAC,OAAO,CAAC;IAS7C,aAAa,IAAI,OAAO,CAAC,IAAI,CAAC;IASpC;;;;;;OAMG;IACG,aAAa,CACjB,GAAG,EAAE,YAAY,EACjB,QAAQ,CAAC,EAAE,OAAO,EAClB,MAAM,GAAE,OAAc,GACrB,OAAO,CAAC,IAAI,CAAC;IAsDhB;;;;;OAKG;IACH,YAAY,IAAI;QACd,qBAAqB,EAAE,MAAM,GAAG,SAAS,CAAC;QAC1C,YAAY,EAAE,MAAM,GAAG,SAAS,CAAC;KAClC;IAOD;;;;;;;OAOG;IACH,OAAO,CAAC,OAAO,CAAC,EAAE,MAAM,EAAE,KAAK,CAAC,EAAE,KAAK,GAAG,MAAM,GAAG,IAAI;IAQvD;;;;;;;OAOG;IACG,kBAAkB,CAAC,GAAG,EAAE,YAAY,EAAE,QAAQ,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC;IAkD5E;;;;;;;;OAQG;IACG,QAAQ,CAAC,IAAI,EAAE,gBAAgB,GAAG,OAAO,CAAC,SAAS,EAAE,CAAC;IAe5D;;;;;OAKG;IACG,oBAAoB,CACxB,UAAU,EAAE,aAAa,GACxB,OAAO,CAAC,aAAa,EAAE,CAAC;IAsB3B;;;;;OAKG;IACH,WAAW,iBAAkB,MAAM,UAAS,OAAO,KAAQ,MAAM,CAW/D;IAEF;;;;;OAKG;IACH,eAAe,CAAC,IAAI,EAAE,KAAK,EAAE,GAAG,KAAK,EAAE;IAgCvC;;;;;OAKG;IACG,aAAa,CAAC,MAAM,EAAE,KAAK,GAAG,OAAO,CAAC,KAAK,EAAE,CAAC;IA6BpD;;;;;;OAMG;IACG,UAAU,CAAC,IAAI,EAAE;QAAE,KAAK,EAAE,UAAU,CAAC;QAAC,MAAM,EAAE,KAAK,CAAA;KAAE,GAAG,OAAO,CAAC,IAAI,CAAC;IAe3E;;;;;;;;OAQG;IACH,gBAAgB,CAAC,IAAI,EAAE,KAAK,EAAE,QAAQ,EAAE,OAAO,GAAG,KAAK;IAsBvD;;;;;;OAMG;IACH,iBAAiB,CAAC,IAAI,EAAE,KAAK,GAAG,MAAM;IAQtC;;;;;;OAMG;IACH,YAAY,CAAC,IAAI,EAAE,KAAK,GAAG,aAAa,GAAG,SAAS;IAKpD;;;;;;OAMG;IACG,UAAU,CAAC,IAAI,EAAE,KAAK,GAAG,OAAO,CAAC,IAAI,CAAC;IAU5C;;;;;OAKG;IACH,SAAS,CAAC,wBAAwB,IAAI,IAAI;IAsB1C;;;;;;OAMG;IACH,gBAAgB,CAAC,WAAW,EAAE,YAAY,GAAG,IAAI;IAMjD;;;;;;OAMG;IACH,cAAc,CAAC,IAAI,EAAE,gBAAgB,GAAG,IAAI;IAe5C;;;;;OAKG;IACH,qBAAqB,CACnB,SAAS,EAAE,MAAM,EACjB,QAAQ,EAAE,MAAM,EAChB,QAAQ,EAAE,MAAM,GACf,IAAI;IAcP;;;;;OAKG;IACH,gBAAgB,IAAI,IAAI;IAoBxB;;;;;;;OAOG;IACH,kBAAkB,CAChB,GAAG,EAAE,MAAM,EACX,IAAI,CAAC,EAAE;QACL,OAAO,CAAC,EAAE,MAAM,CAAC;QACjB,IAAI,CAAC,EAAE,KAAK,GAAG,KAAK,EAAE,CAAC;QACvB,KAAK,CAAC,EAAE,KAAK,CAAC;QACd,QAAQ,CAAC,EAAE,aAAa,CAAC;KAC1B,GACA,IAAI;IAWP;;;;;OAKG;IACG,YAAY,IAAI,OAAO,CAAC,IAAI,CAAC;IA+BnC;;;;;OAKG;IACG,kBAAkB,CAAC,YAAY,EAAE,SAAS,EAAE,GAAG,OAAO,CAAC,IAAI,CAAC;CAyBnE"}

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

@@ -197,7 +197,6 @@ export class GridController extends MDControlController {
         const { hideHeader, enablePagingBar } = this.model;
         this.state.hideHeader = hideHeader;
         this.state.enablePagingBar = enablePagingBar;
-        this.state.hideNoDataImage = false;
     }
     /**
      * 初始化方法
@@ -588,7 +587,7 @@ export class GridController extends MDControlController {
         if (editShowMode === 'row') {
             const editingRow = this.state.rows.find(item => item.showRowEdit);
             if (editingRow) {
-                throw new RuntimeError(ibiz.i18n.t('runtime.controller.control.md.firstComplete'));
+                throw new RuntimeError(ibiz.i18n.t('runtime.controller.common.md.firstComplete'));
             }
         }
         const queryParams = Object.assign({}, this.params);
@@ -632,10 +631,10 @@ export class GridController extends MDControlController {
         const isCreate = data.srfuf === Srfuf.CREATE;
         const rowState = this.findRowState(data);
         if (!rowState) {
-            throw new RuntimeError(ibiz.i18n.t('runtime.controller.control.md.rowData'));
+            throw new RuntimeError(ibiz.i18n.t('runtime.controller.common.md.rowData'));
         }
         if (!rowState.modified) {
-            ibiz.log.debug(ibiz.i18n.t('runtime.controller.control.md.noChange'));
+            ibiz.log.debug(ibiz.i18n.t('runtime.controller.common.md.noChange'));
             return;
         }
         // 如果数据正在处理中，则延迟保存

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

@@ -23,6 +23,13 @@ export declare class ListController extends MDControlController<IDEList, IListSt
      * @return {*}  {Promise<void>}
      */
     loadMore(): Promise<void>;
+    /**
+     * 计算表格展示模式
+     * @author fzh
+     * @date 2024-05-29 19:18:42
+     * @return {*}  {void}
+     */
+    calcShowMode(items: IData): void;
     afterLoad(args: MDCtrlLoadParams, items: IData[]): Promise<IData[]>;
     /**
      * 设置列表数据

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

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

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

@@ -4,6 +4,8 @@ export class ListController extends MDControlController {
     initState() {
         super.initState();
         this.state.noSort = this.model.noSort === true;
+        const { enablePagingBar } = this.model;
+        this.state.enablePagingBar = enablePagingBar;
     }
     async onCreated() {
         await super.onCreated();
@@ -34,8 +36,37 @@ export class ListController extends MDControlController {
             await this.load({ isLoadMore: true });
         }
     }
+    /**
+     * 计算表格展示模式
+     * @author fzh
+     * @date 2024-05-29 19:18:42
+     * @return {*}  {void}
+     */
+    calcShowMode(items) {
+        const { enablePagingBar } = this.model;
+        this.state.hideNoDataImage = false;
+        this.state.enablePagingBar = enablePagingBar;
+        // SHOWMODE = 'DEFAULT'|'ONLYDATA'|'MIXIN'
+        // DEFAULT  默认逻辑
+        const showmode = this.controlParams.showmode || 'DEFAULT';
+        // ONLYDATA 无论有无数据 仅仅显示数据区域，表格头和分页栏都不要
+        if (showmode === 'ONLYDATA') {
+            this.state.enablePagingBar = false;
+            if (items.length === 0) {
+                this.state.hideNoDataImage = true;
+            }
+        }
+        // MIXIN 无数据时，仅仅显示数据区域，表格头和分页栏都不要；有数据时，展示还是和默认一样
+        if (showmode === 'MIXIN') {
+            if (items.length === 0) {
+                this.state.enablePagingBar = false;
+                this.state.hideNoDataImage = true;
+            }
+        }
+    }
     async afterLoad(args, items) {
         await this.handleDataGroup();
+        this.calcShowMode(items);
         return items;
     }
     /**

package/out/controller/control/tree/tree.service.d.ts CHANGED Viewed

@@ -133,5 +133,22 @@ export declare class TreeService<T extends IDETree = IDETree> extends MDControlS
      * @returns {*}  {Promise<IHttpResponse>}
      */
     execWithEntityId(appDataEntityId: string, methodName: string, context: IContext, data?: IData, params?: IParams): Promise<IHttpResponse>;
+    /**
+     * 计算展开逻辑（全展开和只展开首节点expanded都为true）
+     *
+     * @author ljx
+     * @date 2024-06-04 15:08:41
+     * @param {IModel} nodeModel 方法名
+     * @param {number} index 节点下标
+     */
+    calcExpand(nodeModel: IModel, index: number): boolean;
+    /**
+     * 计算静态展开逻辑（全展开和只展开首节点为true）
+     *
+     * @author ljx
+     * @date 2024-06-04 15:08:41
+     * @param {IModel} nodeModel 方法名
+     */
+    calcStaticExpand(nodeModel: IModel): boolean;
 }
 //# sourceMappingURL=tree.service.d.ts.map

package/out/controller/control/tree/tree.service.d.ts.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"tree.service.d.ts","sourceRoot":"","sources":["../../../../src/controller/control/tree/tree.service.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,aAAa,EAAc,MAAM,qBAAqB,CAAC;AAChE,OAAO,EACL,OAAO,EACP,mBAAmB,EACnB,kBAAkB,EAClB,WAAW,EACX,aAAa,EAEd,MAAM,kBAAkB,CAAC;AAC1B,OAAO,~~EAAE~~,aAAa,EAAE,MAAM,oBAAoB,CAAC;~~AAOnD~~,OAAO,EACL,gBAAgB,EAEhB,mBAAmB,EACnB,oBAAoB,EACrB,MAAM,kBAAkB,CAAC;AAG1B,MAAM,WAAW,aAAa;IAC5B;;;;;OAKG;IACH,QAAQ,EAAE,OAAO,CAAC;IAClB;;;;;OAKG;IACH,OAAO,EAAE,QAAQ,CAAC;IAClB;;;;;OAKG;IACH,MAAM,EAAE,OAAO,CAAC;IAEhB;;;;;OAKG;IACH,mBAAmB,CAAC,EAAE,MAAM,EAAE,CAAC;IAE/B;;;;;OAKG;IACH,IAAI,CAAC,EAAE,OAAO,CAAC;CAChB;AAED;;;;;;;GAOG;AACH,qBAAa,WAAW,CACtB,CAAC,SAAS,OAAO,GAAG,OAAO,CAC3B,SAAQ,gBAAgB,CAAC,CAAC,CAAC;IAC3B;;;;;;;OAOG;IACG,eAAe,CACnB,cAAc,EAAE,aAAa,GAAG,SAAS,EACzC,IAAI,EAAE,aAAa,GAClB,OAAO,CAAC,aAAa,EAAE,GAAG,SAAS,CAAC;IA8CvC;;;;;;;;;;OAUG;cACa,oBAAoB,CAClC,SAAS,EAAE,WAAW,EACtB,MAAM,EAAE,aAAa,GAAG,SAAS,EACjC,cAAc,EAAE,aAAa,GAAG,SAAS,EACzC,IAAI,EAAE,aAAa,GAClB,OAAO,CAAC,aAAa,EAAE,CAAC;~~IAqF3B~~;;;;;;;;OAQG;cACa,iBAAiB,CAC/B,SAAS,EAAE,WAAW,EACtB,MAAM,EAAE,aAAa,GAAG,SAAS,EACjC,cAAc,EAAE,aAAa,GAAG,SAAS,EACzC,IAAI,EAAE,aAAa,GAClB,OAAO,CAAC,aAAa,CAAC;~~IAUzB~~;;;;;;;OAOG;IACH,qBAAqB,CACnB,MAAM,EAAE,aAAa,EACrB,cAAc,EAAE,aAAa,GAAG,SAAS,EACzC,IAAI,EAAE,aAAa,GAClB;QACD,OAAO,EAAE,QAAQ,CAAC;QAClB,MAAM,EAAE,OAAO,CAAC;QAChB,UAAU,EAAE,OAAO,CAAC;QACpB,SAAS,EAAE,OAAO,CAAC;KACpB;IA+DD;;;;;;;;OAQG;cACa,cAAc,CAC5B,SAAS,EAAE,kBAAkB,EAC7B,MAAM,EAAE,aAAa,GAAG,SAAS,EACjC,cAAc,EAAE,aAAa,GAAG,SAAS,EACzC,IAAI,EAAE,aAAa,GAClB,OAAO,CAAC,mBAAmB,EAAE,CAAC;~~IA6CjC~~;;;;;;;OAOG;cACa,oBAAoB,CAClC,SAAS,EAAE,mBAAmB,EAC9B,MAAM,EAAE,aAAa,GAAG,SAAS,EACjC,cAAc,EAAE,aAAa,GAAG,SAAS,EACzC,IAAI,EAAE,aAAa,GAClB,OAAO,CAAC,oBAAoB,EAAE,CAAC;~~IA+BlC~~;;;;;;;;OAQG;IACG,UAAU,CACd,eAAe,EAAE,MAAM,EACvB,OAAO,EAAE,QAAQ,EACjB,MAAM,GAAE,OAAY,GACnB,OAAO,CAAC,aAAa,CAAC;IAazB;;;;;;;;;OASG;IACG,gBAAgB,CACpB,eAAe,EAAE,MAAM,EACvB,UAAU,EAAE,MAAM,EAClB,OAAO,EAAE,QAAQ,EACjB,IAAI,CAAC,EAAE,KAAK,EACZ,MAAM,CAAC,EAAE,OAAO,GACf,OAAO,CAAC,aAAa,CAAC;~~CAY1B~~"}
1	+ {"version":3,"file":"tree.service.d.ts","sourceRoot":"","sources":["../../../../src/controller/control/tree/tree.service.ts"],"names":[],"mappings":"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"}

package/out/controller/control/tree/tree.service.js CHANGED Viewed

@@ -87,18 +87,17 @@ export class TreeService extends MDControlService {
                 result = await this.getCodeListNodeDatas(nodeModel, nodeRS, parentNodeData, tempOpts);
                 break;
             default:
-                throw new ModelError(nodeModel, ibiz.i18n.t('runtime.controller.control.md.noSupport', {
+                throw new ModelError(nodeModel, ibiz.i18n.t('runtime.controller.control.gantt.noSupport', {
                     treeNodeType: nodeModel.treeNodeType,
                 }));
         }
         // *查询回来之后,如果有子节点，看默认展开相关配置有时每个节点数据走一遍展开逻辑
-        const { expandFirstOnly, expanded, rootNode } = nodeModel;
+        const { rootNode } = nodeModel;
         const isExpandedRoot = rootNode && !this.model.rootVisible; // root节点不显示的时候默认展开其子节点
         if (!leaf) {
             await Promise.all(result.map(async (childNode, index) => {
                 var _a;
-                if ((expanded && // 全展开合只展开首节点expanded都为true
-                    (!expandFirstOnly || (expandFirstOnly && index === 0))) ||
+                if (this.calcExpand(nodeModel, index) ||
                     (((_a = opts.defaultExpandedKeys) === null || _a === void 0 ? void 0 : _a.length) &&
                         opts.defaultExpandedKeys.includes(childNode._id)) || // 外部回显给的默认展开节点集合有的展开
                     isExpandedRoot) {
@@ -119,7 +118,12 @@ export class TreeService extends MDControlService {
      * @memberof TreeService
      */
     async getStaticNodeData(nodeModel, nodeRS, parentNodeData, opts) {
-        const nodeData = new TreeStaticNodeData(nodeModel, parentNodeData, { parentValueLevel: nodeRS === null || nodeRS === void 0 ? void 0 : nodeRS.parentValueLevel, leaf: !!opts.leaf });
+        const defaultExpand = this.calcStaticExpand(nodeModel);
+        const nodeData = new TreeStaticNodeData(nodeModel, parentNodeData, {
+            parentValueLevel: nodeRS === null || nodeRS === void 0 ? void 0 : nodeRS.parentValueLevel,
+            leaf: !!opts.leaf,
+            defaultExpand,
+        });
         return nodeData;
     }
     /**
@@ -205,12 +209,14 @@ export class TreeService extends MDControlService {
         // 请求实体数据
         const response = await this.app.deService.exec(appDataEntityId, appDEDataSetId, context, params);
         if (response.data.length) {
-            const nodeDatas = response.data.map((item) => {
+            const nodeDatas = response.data.map((item, index) => {
+                const defaultExpand = this.calcExpand(nodeModel, index);
                 return new TreeDataSetNodeData(nodeModel, parentNodeData, {
                     data: item,
                     leaf: !!opts.leaf,
                     navContext,
                     navParams,
+                    defaultExpand,
                 });
             });
             return nodeDatas;
@@ -238,12 +244,14 @@ export class TreeService extends MDControlService {
         // 请求实体数据
         const items = await this.app.codeList.get(nodeModel.codeListId, context, params);
         if (items.length) {
-            const nodeDatas = items.map(item => {
+            const nodeDatas = items.map((item, index) => {
+                const defaultExpand = this.calcExpand(nodeModel, index);
                 return new TreeCodeListNodeData(nodeModel, parentNodeData, {
                     data: item,
                     leaf: !!opts.leaf,
                     navContext,
                     navParams,
+                    defaultExpand,
                 });
             });
             return nodeDatas;
@@ -280,4 +288,27 @@ export class TreeService extends MDControlService {
         const res = await this.app.deService.exec(appDataEntityId, methodName, context, data, params, header);
         return res;
     }
+    /**
+     * 计算展开逻辑（全展开和只展开首节点expanded都为true）
+     *
+     * @author ljx
+     * @date 2024-06-04 15:08:41
+     * @param {IModel} nodeModel 方法名
+     * @param {number} index 节点下标
+     */
+    calcExpand(nodeModel, index) {
+        const { expandFirstOnly, expanded } = nodeModel;
+        return !!expanded && (!expandFirstOnly || (expandFirstOnly && index === 0));
+    }
+    /**
+     * 计算静态展开逻辑（全展开和只展开首节点为true）
+     *
+     * @author ljx
+     * @date 2024-06-04 15:08:41
+     * @param {IModel} nodeModel 方法名
+     */
+    calcStaticExpand(nodeModel) {
+        const { expandFirstOnly, expanded } = nodeModel;
+        return !!expanded || !!expandFirstOnly;
+    }
 }

package/out/controller/control/tree-grid-ex/tree-grid-ex.controller.js CHANGED Viewed

@@ -232,18 +232,18 @@ export class TreeGridExController extends TreeController {
     }
     async save(nodeData) {
         if (this.state.isSimple) {
-            ibiz.log.debug(ibiz.i18n.t('runtime.controller.control.md.simpleMode'));
+            ibiz.log.debug(ibiz.i18n.t('runtime.controller.common.md.simpleMode'));
             return;
         }
         if (nodeData._nodeType !== 'DE') {
-            throw new RuntimeError(ibiz.i18n.t('runtime.controller.control.md.nonentity'));
+            throw new RuntimeError(ibiz.i18n.t('runtime.controller.control.gantt.nonentity'));
         }
         const rowState = this.state.rows[nodeData._uuid];
         if (!rowState) {
-            throw new RuntimeError(ibiz.i18n.t('runtime.controller.control.md.rowData'));
+            throw new RuntimeError(ibiz.i18n.t('runtime.controller.common.md.rowData'));
         }
         if (!rowState.modified) {
-            ibiz.log.debug(ibiz.i18n.t('runtime.controller.control.md.noChange'));
+            ibiz.log.debug(ibiz.i18n.t('runtime.controller.common.md.noChange'));
             return;
         }
         // const isValid = await this.validate(rowState);

package/out/de-logic/de-logic-param/de-logic-param.js CHANGED Viewed

@@ -97,7 +97,7 @@ export class DELogicParam {
         else if (m.sessionParam) {
             throw new ModelError(m, ibiz.i18n.t('runtime.deLogic.deLogicNode.operationSessionVariables'));
         }
-        ibiz.log.debug(ibiz.i18n.t('runtime.deLogic.deLogicNode.calculateEntity', { tag }), ibiz.i18n.t('runtime.deLogic.deLogicNode.value'), ctx.params[tag]);
+        ibiz.log.debug(ibiz.i18n.t('runtime.deLogic.deLogicNode.calculateEntity', { tag }), ibiz.i18n.t('runtime.deLogic.deLogicNode.value'), Object.assign({}, ctx.params[tag]));
     }
     /**
      * 重新建立变量
@@ -117,6 +117,6 @@ export class DELogicParam {
         else {
             throw new ModelError(m, ibiz.i18n.t('runtime.deLogic.deLogicNode.recreatingVariables'));
         }
-        ibiz.log.debug(ibiz.i18n.t('runtime.deLogic.deLogicNode.reEstablish', { tag }), ibiz.i18n.t('runtime.deLogic.deLogicNode.value'), ctx.params[tag]);
+        ibiz.log.debug(ibiz.i18n.t('runtime.deLogic.deLogicNode.reEstablish', { tag }), ibiz.i18n.t('runtime.deLogic.deLogicNode.value'), Object.assign({}, ctx.params[tag]));
     }
 }

package/out/engine/md-view.engine.d.ts.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"md-view.engine.d.ts","sourceRoot":"","sources":["../../src/engine/md-view.engine.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,mBAAmB,EAAc,MAAM,kBAAkB,CAAC;AAGnE,OAAO,EAAE,cAAc,EAAE,MAAM,eAAe,CAAC;AAC/C,OAAO,EACL,YAAY,EACZ,YAAY,EACZ,oBAAoB,EACpB,qBAAqB,EACrB,kBAAkB,EAClB,oBAAoB,EACpB,gBAAgB,EAChB,SAAS,EACT,eAAe,EACf,kBAAkB,EACnB,MAAM,cAAc,CAAC;AAEtB,OAAO,EAAE,cAAc,EAAE,MAAM,oBAAoB,CAAC;AAEpD;;;;;;;GAOG;AACH,qBAAa,YAAa,SAAQ,cAAc;IAC9C,UAAkB,IAAI,EAAE,cAAc,CACpC,mBAAmB,EACnB,YAAY,EACZ,YAAY,CACb,CAAC;IAEF;;;;;;OAMG;IACH,IAAI,gBAAgB,IAAI,MAAM,CAE7B;IAED;;;;;OAKG;IACH,SAAS,KAAK,UAAU,IAAI,qBAAqB,CAEhD;IAED;;;;;OAKG;IACH,SAAS,KAAK,SAAS,IAAI,oBAAoB,CAE9C;IAED;;;;;;;OAOG;IACH,SAAS,KAAK,UAAU,IAAI,kBAAkB,GAAG,SAAS,CAEzD;IAED;;;;;OAKG;IACH,SAAS,KAAK,aAAa,IAAI,qBAAqB,CAEnD;IAED;;;;;OAKG;IACH,SAAS,KAAK,YAAY,IAAI,oBAAoB,CAEjD;IAED;;;;;;OAMG;IACH,SAAS,KAAK,YAAY,IAAI,oBAAoB,CAIjD;IAEK,SAAS,IAAI,OAAO,CAAC,IAAI,CAAC;IAqB1B,SAAS,IAAI,OAAO,CAAC,IAAI,CAAC;~~IAmFhC~~;;;;;OAKG;IACH,mBAAmB,IAAI,IAAI;IAQ3B;;;;;;;OAOG;cACa,aAAa,CAAC,KAAK,EAAE,SAAS,GAAG,OAAO,CAAC,IAAI,CAAC;IAQxD,IAAI,CAAC,GAAG,EAAE,MAAM,EAAE,IAAI,EAAE,GAAG,GAAG,OAAO,CAAC,KAAK,GAAG,IAAI,GAAG,SAAS,CAAC;IAoDrE,SAAS,CAAC,OAAO,IAAI,KAAK,EAAE;IAI5B;;;;;;;;OAQG;cACa,QAAQ,CAAC,IAAI,EAAE;QAC7B,IAAI,EAAE,KAAK,EAAE,CAAC;QACd,KAAK,CAAC,EAAE,UAAU,CAAC;QACnB,OAAO,CAAC,EAAE,QAAQ,CAAC;QACnB,MAAM,CAAC,EAAE,OAAO,CAAC;KAClB,GAAG,OAAO,CAAC,eAAe,CAAC;IAkC5B;;;;;;;;OAQG;cACa,OAAO,CAAC,IAAI,EAAE;QAC5B,IAAI,EAAE,KAAK,EAAE,CAAC;QACd,KAAK,CAAC,EAAE,UAAU,CAAC;QACnB,QAAQ,CAAC,EAAE,OAAO,CAAC;KACpB,GAAG,OAAO,CAAC,eAAe,CAAC;IAsC5B;;;;;;OAMG;cACa,MAAM,CAAC,IAAI,CAAC,EAAE,kBAAkB,GAAG,SAAS,GAAG,OAAO,CAAC,IAAI,CAAC;IAI5E;;;;;OAKG;cACa,IAAI,CAAC,IAAI,GAAE,gBAAqB,GAAG,OAAO,CAAC,IAAI,CAAC;IAIhE;;;;;OAKG;cACa,OAAO,IAAI,OAAO,CAAC,IAAI,CAAC;IAIxC;;;;;OAKG;cACa,MAAM,IAAI,OAAO,CAAC,IAAI,CAAC;IAIvC;;;;;OAKG;IACH,SAAS,CAAC,eAAe,IAAI,OAAO;IAqBpC;;;;;OAKG;cACa,UAAU,IAAI,OAAO,CAAC,IAAI,CAAC;IAI3C;;;;;;OAMG;cACa,UAAU,CAAC,IAAI,EAAE;QAAE,KAAK,EAAE,UAAU,CAAA;KAAE,GAAG,OAAO,CAAC,IAAI,CAAC;IAItE;;;;;;OAMG;IACG,IAAI,CAAC,IAAI,EAAE;QAAE,IAAI,EAAE,KAAK,EAAE,CAAC;QAAC,KAAK,CAAC,EAAE,UAAU,CAAA;KAAE,GAAG,OAAO,CAAC,IAAI,CAAC;IAItE;;;;;;;;OAQG;IACH,SAAS,CAAC,qBAAqB,IAAI,OAAO;IAO1C;;;;;;;;OAQG;IACH,SAAS,CAAC,wBAAwB,IAAI,OAAO;IAiB7C;;;;;OAKG;IACH,SAAS,CAAC,YAAY,IAAI,IAAI;IAU9B;;;;;;;OAOG;IACH,qBAAqB,IAAI,MAAM,EAAE;CAWlC"}
1	+ {"version":3,"file":"md-view.engine.d.ts","sourceRoot":"","sources":["../../src/engine/md-view.engine.ts"],"names":[],"mappings":"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"}

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

@@ -106,6 +106,10 @@ export class MDViewEngine extends ViewEngineBase {
         });
         // 触发视图数据变更
         this.xdataControl.evt.on('onLoadSuccess', event => {
+            var _a, _b;
+            // 更新工具栏状态
+            (_a = this.toolbar) === null || _a === void 0 ? void 0 : _a.calcButtonState(undefined, this.xdataControl.model.appDataEntityId);
+            (_b = this.tabToolbar) === null || _b === void 0 ? void 0 : _b.calcButtonState(undefined, this.xdataControl.model.appDataEntityId);
             this.view.evt.emit('onDataChange', Object.assign(Object.assign({}, event), { actionType: 'LOAD' }));
         });
         this.xdataControl.evt.on('onRemoveSuccess', event => {

package/out/engine/view-base.engine.d.ts CHANGED Viewed

@@ -54,6 +54,14 @@ export declare class ViewEngineBase implements IViewEngine {
      * @type {(IToolbarController | undefined)}
      */
     protected get viewLayoutPanel(): IViewLayoutPanelController | undefined;
+    /**
+     *是否允许请求数据权限
+     *
+     * @protected
+     * @type {boolean}
+     * @memberof ViewEngineBase
+     */
+    protected enabledDataAccAction: boolean;
     /**
      * 构造函数在视图控制器的构造函数逻辑内部执行
      * @author lxm
@@ -164,5 +172,12 @@ export declare class ViewEngineBase implements IViewEngine {
      * @return {*}  {Promise<void>}
      */
     loadEntityData(): Promise<void>;
+    /**
+     * 处理实体权限
+     * @author zzq
+     * @date 2024-06-03 15:59:08
+     * @return {*}  {Promise<void>}
+     */
+    protected handleEntityPrivilege(data: IData, context: IContext): Promise<void>;
 }
 //# sourceMappingURL=view-base.engine.d.ts.map

package/out/engine/view-base.engine.d.ts.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"view-base.engine.d.ts","sourceRoot":"","sources":["../../src/engine/view-base.engine.ts"],"names":[],"mappings":"AAOA,OAAO,EACL,eAAe,EACf,kBAAkB,EAClB,0BAA0B,EAC3B,MAAM,cAAc,CAAC;AACtB,OAAO,EAAE,WAAW,EAAE,MAAM,qBAAqB,CAAC;~~AAGlD~~;;;;;;GAMG;AACH,qBAAa,cAAe,YAAW,WAAW;~~IAmEpC~~,SAAS,CAAC,IAAI,EAAE,eAAe;~~IAlE3C~~;;;;;;;OAOG;IACH,SAAS,KAAK,OAAO,IAAI,kBAAkB,GAAG,SAAS,CAEtD;IAED;;;;;;;OAOG;IACH,SAAS,KAAK,WAAW,IAAI,kBAAkB,GAAG,SAAS,CAE1D;IAED;;;;;;;OAOG;IACH,SAAS,KAAK,YAAY,IAAI,kBAAkB,GAAG,SAAS,CAE3D;IAED;;;;;;;OAOG;IACH,SAAS,KAAK,aAAa,IAAI,kBAAkB,GAAG,SAAS,CAE5D;IAED;;;;;;;OAOG;IACH,SAAS,KAAK,eAAe,IAAI,0BAA0B,GAAG,SAAS,CAEtE;IAED;;;;;OAKG;gBACmB,IAAI,EAAE,eAAe;IAK3C;;;;;;OAMG;IACH,SAAS,CAAC,IAAI,IAAI,IAAI;IAItB;;;;;OAKG;IACH,mBAAmB,IAAI,IAAI;~~IAErB~~,SAAS,IAAI,OAAO,CAAC,IAAI,CAAC;IAWhC;;;;;;OAMG;IACH,SAAS,CAAC,iBAAiB,IAAI,IAAI;IAWnC;;;;;;;OAOG;IACH,SAAS,CAAC,qBAAqB,IAAI,MAAM,EAAE;IAmC3C;;;;;;;;;OASG;IACH,OAAO,CAAC,iBAAiB;IAqBnB,SAAS,IAAI,OAAO,CAAC,IAAI,CAAC;IAW1B,WAAW,IAAI,OAAO,CAAC,IAAI,CAAC;IAI5B,IAAI,CAAC,GAAG,EAAE,MAAM,EAAE,KAAK,CAAC,EAAE,KAAK,GAAG,OAAO,CAAC,KAAK,GAAG,IAAI,GAAG,SAAS,CAAC;IAUzE;;;;;;OAMG;IAEG,UAAU,CAAC,IAAI,EAAE,GAAG,GAAG,OAAO,CAAC,GAAG,CAAC;IAmCzC;;;;;OAKG;IACH,SAAS,CAAC,aAAa,IAAI,IAAI;IAI/B;;;;;OAKG;IACH,SAAS,CAAC,OAAO,IAAI,KAAK,EAAE;IAI5B;;;;;;;OAOG;IACH,SAAS,CAAC,qBAAqB,IAAI,OAAO;IAsB1C;;;;;;;;OAQG;IACH,kBAAkB,CAAC,IAAI,EAAE,MAAM,GAAG,OAAO;IAmBzC;;;;;;OAMG;IACH,SAAS,CAAC,qBAAqB,IAAI,OAAO;IAU1C;;;;;OAKG;IACG,cAAc,IAAI,OAAO,CAAC,IAAI,CAAC;~~CA2BtC~~"}
1	+ {"version":3,"file":"view-base.engine.d.ts","sourceRoot":"","sources":["../../src/engine/view-base.engine.ts"],"names":[],"mappings":"AAOA,OAAO,EACL,eAAe,EACf,kBAAkB,EAClB,0BAA0B,EAC3B,MAAM,cAAc,CAAC;AACtB,OAAO,EAAE,WAAW,EAAE,MAAM,qBAAqB,CAAC;AAIlD;;;;;;GAMG;AACH,qBAAa,cAAe,YAAW,WAAW;IA4EpC,SAAS,CAAC,IAAI,EAAE,eAAe;IA3E3C;;;;;;;OAOG;IACH,SAAS,KAAK,OAAO,IAAI,kBAAkB,GAAG,SAAS,CAEtD;IAED;;;;;;;OAOG;IACH,SAAS,KAAK,WAAW,IAAI,kBAAkB,GAAG,SAAS,CAE1D;IAED;;;;;;;OAOG;IACH,SAAS,KAAK,YAAY,IAAI,kBAAkB,GAAG,SAAS,CAE3D;IAED;;;;;;;OAOG;IACH,SAAS,KAAK,aAAa,IAAI,kBAAkB,GAAG,SAAS,CAE5D;IAED;;;;;;;OAOG;IACH,SAAS,KAAK,eAAe,IAAI,0BAA0B,GAAG,SAAS,CAEtE;IAED;;;;;;OAMG;IACH,SAAS,CAAC,oBAAoB,EAAE,OAAO,CAAS;IAEhD;;;;;OAKG;gBACmB,IAAI,EAAE,eAAe;IAK3C;;;;;;OAMG;IACH,SAAS,CAAC,IAAI,IAAI,IAAI;IAItB;;;;;OAKG;IACH,mBAAmB,IAAI,IAAI;IAUrB,SAAS,IAAI,OAAO,CAAC,IAAI,CAAC;IAWhC;;;;;;OAMG;IACH,SAAS,CAAC,iBAAiB,IAAI,IAAI;IAWnC;;;;;;;OAOG;IACH,SAAS,CAAC,qBAAqB,IAAI,MAAM,EAAE;IAmC3C;;;;;;;;;OASG;IACH,OAAO,CAAC,iBAAiB;IAqBnB,SAAS,IAAI,OAAO,CAAC,IAAI,CAAC;IAW1B,WAAW,IAAI,OAAO,CAAC,IAAI,CAAC;IAI5B,IAAI,CAAC,GAAG,EAAE,MAAM,EAAE,KAAK,CAAC,EAAE,KAAK,GAAG,OAAO,CAAC,KAAK,GAAG,IAAI,GAAG,SAAS,CAAC;IAUzE;;;;;;OAMG;IAEG,UAAU,CAAC,IAAI,EAAE,GAAG,GAAG,OAAO,CAAC,GAAG,CAAC;IAmCzC;;;;;OAKG;IACH,SAAS,CAAC,aAAa,IAAI,IAAI;IAI/B;;;;;OAKG;IACH,SAAS,CAAC,OAAO,IAAI,KAAK,EAAE;IAI5B;;;;;;;OAOG;IACH,SAAS,CAAC,qBAAqB,IAAI,OAAO;IAsB1C;;;;;;;;OAQG;IACH,kBAAkB,CAAC,IAAI,EAAE,MAAM,GAAG,OAAO;IAmBzC;;;;;;OAMG;IACH,SAAS,CAAC,qBAAqB,IAAI,OAAO;IAU1C;;;;;OAKG;IACG,cAAc,IAAI,OAAO,CAAC,IAAI,CAAC;IAiCrC;;;;;OAKG;cACa,qBAAqB,CACnC,IAAI,EAAE,KAAK,EACX,OAAO,EAAE,QAAQ,GAChB,OAAO,CAAC,IAAI,CAAC;CAYjB"}

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

@@ -1,6 +1,7 @@
 import { RuntimeError, findRecursiveChild, IBizContext, } from '@ibiz-template/core';
 import { SysUIActionTag, ViewCallTag } from '../constant';
 import { getControl } from '../model';
+import { fieldValueToBoolean } from '../service';
 /**
  * 视图引擎基类
  * @author lxm
@@ -72,6 +73,14 @@ export class ViewEngineBase {
      */
     constructor(view) {
         this.view = view;
+        /**
+         *是否允许请求数据权限
+         *
+         * @protected
+         * @type {boolean}
+         * @memberof ViewEngineBase
+         */
+        this.enabledDataAccAction = false;
         this.init();
         this.initViewState();
     }
@@ -91,7 +100,13 @@ export class ViewEngineBase {
      * @date 2024-03-12 13:50:07
      * @return {*}  {Promise<void>}
      */
-    handleContextParams() { }
+    handleContextParams() {
+        // 若视图参数配置了srfdataaccaction，则加载实体数据时请求权限，同时删除srfdataaccaction
+        if (this.view.params.srfdataaccaction) {
+            this.enabledDataAccAction = fieldValueToBoolean(this.view.params.srfdataaccaction);
+            delete this.view.params.srfdataaccaction;
+        }
+    }
     async onCreated() {
         const { childNames, modal } = this.view;
         modal.hooks.shouldDismiss.tapPromise(async (context) => {
@@ -341,9 +356,12 @@ export class ViewEngineBase {
             throw new RuntimeError(ibiz.i18n.t('runtime.engine.loadEntityData'));
         }
         const app = ibiz.hub.getApp(context.srfappid);
-        const res = await app.deService.exec(appDataEntityId, 'get', context, params);
+        const res = await app.deService.exec(appDataEntityId, 'get', context, params, undefined, { srfdataaccaction: this.enabledDataAccAction });
         const { data } = res;
         if (data) {
+            if (this.enabledDataAccAction) {
+                await this.handleEntityPrivilege(data, this.view.context);
+            }
             // 更新视图作用域数据和srfreadonly数据
             this.view.state.srfactiveviewdata = data;
             if (data.srfreadonly) {
@@ -355,4 +373,19 @@ export class ViewEngineBase {
             }
         }
     }
+    /**
+     * 处理实体权限
+     * @author zzq
+     * @date 2024-06-03 15:59:08
+     * @return {*}  {Promise<void>}
+     */
+    async handleEntityPrivilege(data, context) {
+        const { appDataEntityId } = this.view.model;
+        if (!data.srfdataaccaction) {
+            return;
+        }
+        const app = ibiz.hub.getApp(context.srfappid);
+        const deAuthority = await app.authority.getService(appDataEntityId);
+        deAuthority.setDataAccAction({ srfkey: data.srfkey, srfsessionid: context.srfsessionid }, data.srfdataaccaction);
+    }
 }

package/out/interface/common/i-app-hub-service/i-app-hub-service.d.ts CHANGED Viewed

@@ -1,4 +1,4 @@
-import { IAppDataEntity, IAppView, IApplication } from '@ibiz/model-core';
+import { IAppBICube, IAppBIReport, IAppBIScheme, IAppDataEntity, IAppView, IApplication } from '@ibiz/model-core';
 import { Convert } from '../../../hub';
 import { ModelLoaderProvider } from '../../provider';
 import { IAppConfigService } from '../i-app-config-service/i-app-config-service';
@@ -169,6 +169,36 @@ export interface IAppHubService {
      * @return {*}  {Promise<IAppDataEntity>}
      */
     getAppDataEntity(id: string, appId?: string): Promise<IAppDataEntity>;
+    /**
+     * 获取应用智能报表体系
+     *
+     * @author tony001
+     * @date 2024-06-04 16:06:25
+     * @param {string} appId 应用标识
+     * @param {string[]} ids 智能报表体系标识集合
+     * @return {*}  {Promise<IAppBIScheme[]>}
+     */
+    getAppBISchemes(appId: string, ids: string[]): Promise<IAppBIScheme[]>;
+    /**
+     * 获取应用智能报表立方体数据
+     *
+     * @author tony001
+     * @date 2024-06-04 17:06:01
+     * @param {string[]} ids 智能报表立方体标识集合
+     * @param {string} appId 应用标识
+     * @return {*}  {Promise<IAppBICube[]>}
+     */
+    getAppAppBICubes(ids: string[], appId: string): Promise<IAppBICube[]>;
+    /**
+     * 获取应用智能报表数据
+     *
+     * @author tony001
+     * @date 2024-06-04 16:06:51
+     * @param {string[]} ids 智能报表标识集合
+     * @param {string} appId 应用标识
+     * @return {*}  {Promise<IAppBIReport[]>}
+     */
+    getAppBIReports(ids: string[], appId: string): Promise<IAppBIReport[]>;
     /**
      * 异步获取应用对象，用于不确定应用是否已经加载的情况
      *