@ibiz-template/runtime 0.6.5 → 0.6.7

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

@@ -1 +1 @@
-{"version":3,"file":"report-panel.service.d.ts","sourceRoot":"","sources":["../../../../src/controller/control/report-panel/report-panel.service.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,cAAc,EAAE,cAAc,EAAE,MAAM,kBAAkB,CAAC;AAClE,OAAO,EAAE,aAAa,EAAE,MAAM,qBAAqB,CAAC;AACpD,OAAO,EAAE,cAAc,EAAE,SAAS,EAAE,MAAM,kBAAkB,CAAC;AAE7D,qBAAa,kBAAkB,CAC7B,CAAC,SAAS,cAAc,GAAG,cAAc,CACzC,SAAQ,cAAc,CAAC,CAAC,CAAC;IACzB;;;;;OAKG;IACH,SAAS,CAAC,UAAU,EAAG,cAAc,CAAC;IAEtC;;;;;;OAMG;IACG,KAAK,CACT,OAAO,EAAE,QAAQ,EACjB,MAAM,GAAE,OAAY,GACnB,OAAO,CAAC,aAAa,CAAC,SAAS,CAAC,CAAC;CAerC"}
+{"version":3,"file":"report-panel.service.d.ts","sourceRoot":"","sources":["../../../../src/controller/control/report-panel/report-panel.service.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,cAAc,EAAE,cAAc,EAAE,MAAM,kBAAkB,CAAC;AAClE,OAAO,EAAE,aAAa,EAAE,MAAM,qBAAqB,CAAC;AACpD,OAAO,EAAE,cAAc,EAAE,SAAS,EAAE,MAAM,kBAAkB,CAAC;AAE7D,qBAAa,kBAAkB,CAC7B,CAAC,SAAS,cAAc,GAAG,cAAc,CACzC,SAAQ,cAAc,CAAC,CAAC,CAAC;IACzB;;;;;OAKG;IACH,SAAS,CAAC,UAAU,EAAG,cAAc,CAAC;IAEtC;;;;;;OAMG;IACG,KAAK,CACT,OAAO,EAAE,QAAQ,EACjB,MAAM,GAAE,OAAY,GACnB,OAAO,CAAC,aAAa,CAAC,SAAS,CAAC,CAAC;CAarC"}

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

@@ -8,9 +8,8 @@ export class ReportPanelService extends ControlService {
      * @returns {*}  {Promise<IHttpResponse>}
      */
     async fetch(context, params = {}) {
-        var _a;
         this.dataEntity = await ibiz.hub.getAppDataEntity(this.model.appDataEntityId, this.model.appId);
-        const url = `${(_a = this.dataEntity.codeName2) === null || _a === void 0 ? void 0 : _a.toLowerCase()}/report?srfreporttag=${this.model.codeName}`;
+        const url = `${this.dataEntity.deapicodeName2}/report?srfreporttag=${this.model.codeName}`;
         let res = await ibiz.net.request(url, {
             method: 'post',
             data: params,

package/out/controller/control/toolbar/toolbar.controllerr.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"toolbar.controllerr.d.ts","sourceRoot":"","sources":["../../../../src/controller/control/toolbar/toolbar.controllerr.ts"],"names":[],"mappings":"AACA,OAAO,EACL,UAAU,EACV,cAAc,EAEd,aAAa,EAEd,MAAM,kBAAkB,CAAC;AAE1B,OAAO,EACL,aAAa,EACb,aAAa,EACb,kBAAkB,EAClB,YAAY,EAEb,MAAM,oBAAoB,CAAC;AAI5B,OAAO,EAAE,iBAAiB,EAAE,MAAM,cAAc,CAAC;AACjD,OAAO,EACL,eAAe,EAGhB,MAAM,aAAa,CAAC;AAErB;;;;;;;GAOG;AACH,qBAAa,iBAAiB,CAC1B,CAAC,SAAS,UAAU,GAAG,UAAU,EACjC,CAAC,SAAS,aAAa,GAAG,aAAa,EACvC,CAAC,SAAS,aAAa,GAAG,aAAa,CAEzC,SAAQ,iBAAiB,CAAC,CAAC,EAAE,CAAC,EAAE,CAAC,CACjC,YAAW,kBAAkB,CAAC,CAAC,EAAE,CAAC,EAAE,CAAC,CAAC;IAEtC,SAAS,KAAK,IAAI,IAAI,eAAe,CAAC,aAAa,CAAC,CAEnD;IAED,SAAS,CAAC,SAAS,IAAI,IAAI;IAO3B;;;;;;;;;;;OAWG;cACa,UAAU,CACxB,IAAI,EAAE,cAAc,EACpB,KAAK,EAAE,UAAU,EACjB,KAAK,GAAE,KAAU,GAChB,OAAO,CAAC,IAAI,CAAC;cAwCA,SAAS,IAAI,OAAO,CAAC,IAAI,CAAC;IA4C1C;;;;;;;;;;OAUG;IACG,WAAW,CACf,IAAI,EAAE,cAAc,GAAG,YAAY,EACnC,KAAK,EAAE,UAAU,EACjB,MAAM,CAAC,EAAE,KAAK,GACb,OAAO,CAAC,IAAI,CAAC;IAcV,eAAe,CAAC,IAAI,CAAC,EAAE,KAAK,EAAE,OAAO,CAAC,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC;IAgDpE,eAAe,CACb,QAAQ,EAAE,QAAQ,GAAG,OAAO,GAAG,MAAM,EACrC,OAAO,EAAE,YAAY,EAAE,GACtB,IAAI;IAOP,iBAAiB,CAAC,QAAQ,CAAC,EAAE,QAAQ,GAAG,OAAO,GAAG,MAAM,GAAG,IAAI;IAS/D,SAAS,CAAC,oBAAoB,CAAC,MAAM,GAAE,aAAa,EAAO,GAAG,IAAI;IAelE;;;;;OAKG;IACH,SAAS,CAAC,wBAAwB,IAAI,IAAI;CAqB3C"}
+{"version":3,"file":"toolbar.controllerr.d.ts","sourceRoot":"","sources":["../../../../src/controller/control/toolbar/toolbar.controllerr.ts"],"names":[],"mappings":"AACA,OAAO,EACL,UAAU,EACV,cAAc,EAEd,aAAa,EAEd,MAAM,kBAAkB,CAAC;AAE1B,OAAO,EACL,aAAa,EACb,aAAa,EACb,kBAAkB,EAClB,YAAY,EAEb,MAAM,oBAAoB,CAAC;AAI5B,OAAO,EAAE,iBAAiB,EAAE,MAAM,cAAc,CAAC;AACjD,OAAO,EACL,eAAe,EAGhB,MAAM,aAAa,CAAC;AAErB;;;;;;;GAOG;AACH,qBAAa,iBAAiB,CAC1B,CAAC,SAAS,UAAU,GAAG,UAAU,EACjC,CAAC,SAAS,aAAa,GAAG,aAAa,EACvC,CAAC,SAAS,aAAa,GAAG,aAAa,CAEzC,SAAQ,iBAAiB,CAAC,CAAC,EAAE,CAAC,EAAE,CAAC,CACjC,YAAW,kBAAkB,CAAC,CAAC,EAAE,CAAC,EAAE,CAAC,CAAC;IAEtC,SAAS,KAAK,IAAI,IAAI,eAAe,CAAC,aAAa,CAAC,CAEnD;IAED,SAAS,CAAC,SAAS,IAAI,IAAI;IAO3B;;;;;;;;;;;OAWG;cACa,UAAU,CACxB,IAAI,EAAE,cAAc,EACpB,KAAK,EAAE,UAAU,EACjB,KAAK,GAAE,KAAU,GAChB,OAAO,CAAC,IAAI,CAAC;cAwCA,SAAS,IAAI,OAAO,CAAC,IAAI,CAAC;IA6C1C;;;;;;;;;;OAUG;IACG,WAAW,CACf,IAAI,EAAE,cAAc,GAAG,YAAY,EACnC,KAAK,EAAE,UAAU,EACjB,MAAM,CAAC,EAAE,KAAK,GACb,OAAO,CAAC,IAAI,CAAC;IAcV,eAAe,CAAC,IAAI,CAAC,EAAE,KAAK,EAAE,OAAO,CAAC,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC;IAgDpE,eAAe,CACb,QAAQ,EAAE,QAAQ,GAAG,OAAO,GAAG,MAAM,EACrC,OAAO,EAAE,YAAY,EAAE,GACtB,IAAI;IAOP,iBAAiB,CAAC,QAAQ,CAAC,EAAE,QAAQ,GAAG,OAAO,GAAG,MAAM,GAAG,IAAI;IAS/D,SAAS,CAAC,oBAAoB,CAAC,MAAM,GAAE,aAAa,EAAO,GAAG,IAAI;IAelE;;;;;OAKG;IACH,SAAS,CAAC,wBAAwB,IAAI,IAAI;CAqB3C"}

package/out/controller/control/toolbar/toolbar.controllerr.js

@@ -80,7 +80,8 @@ export class ToolbarController extends ControlController {
                     const controlLogic = item.controlLogics[i];
                     const itemState = this.state.buttonsState[item.id];
                     if (controlLogic.itemName === item.id &&
-                        controlLogic.triggerType === 'ITEMVISIBLE') {
+                        controlLogic.triggerType === 'ITEMVISIBLE' &&
+                        itemState) {
                         itemState.visible = false;
                         break;
                     }

package/out/controller/utils/data-file-util/data-file-util.js

@@ -43,7 +43,7 @@ function listenAsyncAction(id) {
 export async function asyncImportData(file, appDataEntity, dataImport, context) {
     const data = new FormData();
     data.append('file', file);
-    let url = `/${appDataEntity.codeName2.toLowerCase()}/${asyncImportUrl}`;
+    let url = `/${appDataEntity.deapicodeName2}/${asyncImportUrl}`;
     if (dataImport === null || dataImport === void 0 ? void 0 : dataImport.codeName) {
         url += `?srfimporttag=${dataImport.codeName}`;
     }
@@ -73,7 +73,7 @@ export async function asyncImportData(file, appDataEntity, dataImport, context)
 export async function importData(file, appDataEntity, dataImport, context) {
     const data = new FormData();
     data.append('file', file);
-    let url = `/${appDataEntity.codeName2.toLowerCase()}/${importUrl}`;
+    let url = `/${appDataEntity.deapicodeName2}/${importUrl}`;
     if (dataImport === null || dataImport === void 0 ? void 0 : dataImport.codeName) {
         url += `?srfimporttag=${dataImport.codeName}`;
     }

package/out/model/utils/util.d.ts

@@ -1,4 +1,4 @@
-import { IAppView, IAppViewRef, IControl, IControlRender, IModelObject, IPanel, ISysPFPlugin } from '@ibiz/model-core';
+import { IAppDEMethod, IAppDataEntity, IAppView, IAppViewRef, IControl, IControlRender, IModelObject, IPanel, ISysPFPlugin } from '@ibiz/model-core';
 /**
  * 在数据模型中查找对应 id 模型
  *
@@ -64,4 +64,15 @@ export declare function getPFPlugin(id: string, appId: string): ISysPFPlugin;
 export declare function getControlPanel(control: {
     controlRenders?: IControlRender[];
 }): IPanel | undefined;
+/**
+ * 在应用实体模型中查找对应 id 应用方法
+ * 解决应用实体方法名和行为，数据集方法不一致的问题
+ * @author lionlau
+ * @date 2024-03-09 18:04:21
+ * @export
+ * @param {IAppDataEntity} appDataEntity
+ * @param {string} id
+ * @return {*}  {(IAppDEMethod | null)}
+ */
+export declare function findAppDEMethod(appDataEntity: IAppDataEntity, id: string): IAppDEMethod | null;
 //# sourceMappingURL=util.d.ts.map

package/out/model/utils/util.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"util.d.ts","sourceRoot":"","sources":["../../../src/model/utils/util.ts"],"names":[],"mappings":"AACA,OAAO,EACL,QAAQ,EACR,WAAW,EACX,QAAQ,EACR,cAAc,EACd,YAAY,EACZ,MAAM,EACN,YAAY,EACb,MAAM,kBAAkB,CAAC;AAE1B;;;;;;;;;GASG;AACH,wBAAgB,cAAc,CAC5B,MAAM,EAAE,YAAY,EAAE,EACtB,EAAE,EAAE,MAAM,GACT,YAAY,GAAG,IAAI,CAarB;AAED;;;;;;;;GAQG;AACH,wBAAgB,UAAU,CAAC,IAAI,EAAE,QAAQ,EAAE,GAAG,EAAE,MAAM,GAAG,QAAQ,GAAG,SAAS,CAQ5E;AAED;;;;;;;;GAQG;AACH,wBAAgB,aAAa,CAC3B,IAAI,EAAE,QAAQ,EACd,GAAG,EAAE,MAAM,GACV,WAAW,GAAG,SAAS,CAQzB;AAED;;;;;;GAMG;AACH,wBAAgB,eAAe,CAAC,UAAU,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,GAAG;IACnE,gBAAgB,EAAE,OAAO,CAAC;IAC1B,cAAc,EAAE,OAAO,CAAC;IACxB,KAAK,EAAE,OAAO,CAAC;CAChB,CAyBA;AAED;;;;;;;;;GASG;AACH,wBAAgB,WAAW,CAAC,EAAE,EAAE,MAAM,EAAE,KAAK,EAAE,MAAM,GAAG,YAAY,CAgBnE;AAED;;;;;;;GAOG;AACH,wBAAgB,eAAe,CAAC,OAAO,EAAE;IACvC,cAAc,CAAC,EAAE,cAAc,EAAE,CAAC;CACnC,GAAG,MAAM,GAAG,SAAS,CASrB"}
+{"version":3,"file":"util.d.ts","sourceRoot":"","sources":["../../../src/model/utils/util.ts"],"names":[],"mappings":"AACA,OAAO,EAGL,YAAY,EACZ,cAAc,EACd,QAAQ,EACR,WAAW,EACX,QAAQ,EACR,cAAc,EACd,YAAY,EACZ,MAAM,EACN,YAAY,EACb,MAAM,kBAAkB,CAAC;AAE1B;;;;;;;;;GASG;AACH,wBAAgB,cAAc,CAC5B,MAAM,EAAE,YAAY,EAAE,EACtB,EAAE,EAAE,MAAM,GACT,YAAY,GAAG,IAAI,CAarB;AAED;;;;;;;;GAQG;AACH,wBAAgB,UAAU,CAAC,IAAI,EAAE,QAAQ,EAAE,GAAG,EAAE,MAAM,GAAG,QAAQ,GAAG,SAAS,CAQ5E;AAED;;;;;;;;GAQG;AACH,wBAAgB,aAAa,CAC3B,IAAI,EAAE,QAAQ,EACd,GAAG,EAAE,MAAM,GACV,WAAW,GAAG,SAAS,CAQzB;AAED;;;;;;GAMG;AACH,wBAAgB,eAAe,CAAC,UAAU,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,GAAG;IACnE,gBAAgB,EAAE,OAAO,CAAC;IAC1B,cAAc,EAAE,OAAO,CAAC;IACxB,KAAK,EAAE,OAAO,CAAC;CAChB,CAyBA;AAED;;;;;;;;;GASG;AACH,wBAAgB,WAAW,CAAC,EAAE,EAAE,MAAM,EAAE,KAAK,EAAE,MAAM,GAAG,YAAY,CAgBnE;AAED;;;;;;;GAOG;AACH,wBAAgB,eAAe,CAAC,OAAO,EAAE;IACvC,cAAc,CAAC,EAAE,cAAc,EAAE,CAAC;CACnC,GAAG,MAAM,GAAG,SAAS,CASrB;AAED;;;;;;;;;GASG;AACH,wBAAgB,eAAe,CAC7B,aAAa,EAAE,cAAc,EAC7B,EAAE,EAAE,MAAM,GACT,YAAY,GAAG,IAAI,CA0BrB"}

package/out/model/utils/util.js

@@ -134,3 +134,40 @@ export function getControlPanel(control) {
     }
     return layoutPanel;
 }
+/**
+ * 在应用实体模型中查找对应 id 应用方法
+ * 解决应用实体方法名和行为，数据集方法不一致的问题
+ * @author lionlau
+ * @date 2024-03-09 18:04:21
+ * @export
+ * @param {IAppDataEntity} appDataEntity
+ * @param {string} id
+ * @return {*}  {(IAppDEMethod | null)}
+ */
+export function findAppDEMethod(appDataEntity, id) {
+    const models = appDataEntity.appDEMethods;
+    if (models && id) {
+        const model = findModelChild(models, id);
+        if (model) {
+            return model;
+        }
+        const model2 = models.find(item => {
+            switch (item.methodType) {
+                case 'DEACTION': {
+                    const { actionTag } = item;
+                    return (actionTag === null || actionTag === void 0 ? void 0 : actionTag.toLowerCase()) === id.toLowerCase();
+                }
+                case 'FETCH': {
+                    const { dataSetTag } = item;
+                    return `fetch${dataSetTag === null || dataSetTag === void 0 ? void 0 : dataSetTag.toLowerCase()}` === id.toLowerCase();
+                }
+                default:
+                    return false;
+            }
+        });
+        if (model2) {
+            return model2;
+        }
+    }
+    return null;
+}

package/out/service/service/entity/de.service.js

@@ -2,7 +2,7 @@ import { ModelError, RuntimeError, RuntimeModelError, } from '@ibiz-template/cor
 import { DECache, calcResPath } from '../../utils';
 import { WorkFlowService } from '../work-flow/work-flow.service';
 import { FileService } from '../file/file.service';
-import { findModelChild } from '../../../model';
+import { findAppDEMethod } from '../../../model';
 import { ConfigService } from '../config/config.service';
 import { getDEMethodProvider } from '../../../register';
 import { AppDataEntity } from '../../app-data-entity/app-data-entity';
@@ -64,7 +64,7 @@ export class DEService {
         if (this.methodMap.has(cacheId)) {
             return this.methodMap.get(cacheId);
         }
-        const model = findModelChild(this.model.appDEMethods, id);
+        const model = findAppDEMethod(this.model, id);
         if (!model) {
             throw new RuntimeModelError(this.model, `未找到服务方法: ${id}`);
         }
@@ -214,7 +214,7 @@ export class DEService {
      */
     calcSsePath(context, isHistories = false) {
         const srfkey = context[this.model.codeName.toLowerCase()];
-        const curPath = `/${this.model.codeName2.toLowerCase()}/ssechatcompletion${isHistories ? '/histories' : ''}${srfkey ? `/${srfkey}` : ''}`;
+        const curPath = `/${this.model.deapicodeName2}/ssechatcompletion${isHistories ? '/histories' : ''}${srfkey ? `/${srfkey}` : ''}`;
         const resPath = calcResPath(context, this.model);
         return resPath + curPath;
     }

package/out/service/service/entity/method/de-action.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"de-action.d.ts","sourceRoot":"","sources":["../../../../../src/service/service/entity/method/de-action.ts"],"names":[],"mappings":"AAAA,OAAO,EAEL,YAAY,EACZ,aAAa,EAGd,MAAM,qBAAqB,CAAC;AAC7B,OAAO,EAAE,YAAY,EAAE,MAAM,kBAAkB,CAAC;AAIhD,OAAO,EAAE,MAAM,EAAE,MAAM,UAAU,CAAC;AAClC,OAAO,EAAE,WAAW,EAAE,MAAM,uBAAuB,CAAC;AAIpD;;;;;;;;GAQG;AACH,qBAAa,cAAe,SAAQ,MAAM;IAChC,MAAM,EAAE,YAAY,CAAC;IAE7B;;;;;;;OAOG;IACG,WAAW,CACf,OAAO,EAAE,QAAQ,EACjB,IAAI,EAAE,KAAK,GAAG,KAAK,EAAE,GACpB,OAAO,CAAC,KAAK,GAAG,KAAK,EAAE,CAAC;IAQrB,IAAI,CACR,OAAO,EAAE,QAAQ,EACjB,IAAI,CAAC,EAAE,KAAK,GAAG,KAAK,EAAE,EACtB,MAAM,CAAC,EAAE,OAAO,EAChB,MAAM,CAAC,EAAE,KAAK,GACb,OAAO,CAAC,YAAY,CAAC,KAAK,CAAC,CAAC;IAkF/B;;;;;;;;OAQG;IACG,MAAM,CACV,OAAO,EAAE,QAAQ,EACjB,IAAI,CAAC,EAAE,KAAK,GAAG,KAAK,EAAE,EACtB,MAAM,CAAC,EAAE,OAAO,EAChB,MAAM,CAAC,EAAE,KAAK,GACb,OAAO,CAAC,aAAa,CAAC,WAAW,CAAC,CAAC;IAatC;;;;;;;;OAQG;IACG,MAAM,CACV,OAAO,EAAE,QAAQ,EACjB,MAAM,CAAC,EAAE,OAAO,EAChB,MAAM,CAAC,EAAE,KAAK,GACb,OAAO,CAAC,aAAa,CAAC,WAAW,CAAC,CAAC;IAatC;;;;;;;;;OASG;IACG,MAAM,CACV,OAAO,EAAE,QAAQ,EACjB,IAAI,CAAC,EAAE,KAAK,GAAG,KAAK,EAAE,EACtB,MAAM,CAAC,EAAE,OAAO,EAChB,MAAM,CAAC,EAAE,KAAK,GACb,OAAO,CAAC,aAAa,CAAC,WAAW,CAAC,CAAC;IAkBtC;;;;;;;;OAQG;IACG,GAAG,CACP,OAAO,EAAE,QAAQ,EACjB,MAAM,GAAE,OAAY,EACpB,MAAM,GAAE,KAAU,GACjB,OAAO,CAAC,aAAa,CAAC,WAAW,CAAC,CAAC;IActC;;;;;;;;OAQG;IACG,QAAQ,CACZ,OAAO,EAAE,QAAQ,EACjB,MAAM,CAAC,EAAE,OAAO,EAChB,MAAM,CAAC,EAAE,KAAK,GACb,OAAO,CAAC,aAAa,CAAC,KAAK,CAAC,CAAC;IAUhC;;;;;;;;OAQG;IACG,UAAU,CACd,OAAO,EAAE,QAAQ,EACjB,MAAM,EAAE,KAAK,GAAG,KAAK,EAAE,GACtB,OAAO,CAAC,aAAa,CAAC,WAAW,CAAC,CAAC;IA4BtC;;;;;;;;OAQG;IACG,YAAY,CAChB,QAAQ,EAAE,OAAO,EACjB,OAAO,CAAC,EAAE,OAAO,GAChB,OAAO,CAAC,aAAa,CAAC,WAAW,CAAC,CAAC;IAatC;;;;;;;;OAQG;IACG,UAAU,CACd,OAAO,EAAE,QAAQ,EACjB,MAAM,CAAC,EAAE,OAAO,GACf,OAAO,CAAC,aAAa,CAAC,WAAW,CAAC,CAAC;IA+BtC;;;;;;;;;;OAUG;cACa,mBAAmB,CACjC,GAAG,EAAE,MAAM,EACX,OAAO,EAAE,QAAQ,EACjB,OAAO,CAAC,EAAE,OAAO,GAChB,OAAO,CAAC,IAAI,CAAC;IAuGhB;;;;;;;;OAQG;IACG,UAAU,CACd,OAAO,EAAE,QAAQ,EACjB,MAAM,EAAE,KAAK,GAAG,KAAK,EAAE,GACtB,OAAO,CAAC,aAAa,CAAC,WAAW,CAAC,CAAC;IA+BtC;;;;;;;;OAQG;IACG,OAAO,CACX,OAAO,EAAE,QAAQ,EACjB,MAAM,CAAC,EAAE,OAAO,GACf,OAAO,CAAC,aAAa,CAAC,WAAW,CAAC,CAAC;IAmBtC;;;;;;OAMG;IACG,eAAe,CACnB,QAAQ,EAAE,QAAQ,EAClB,OAAO,CAAC,EAAE,OAAO,GAChB,OAAO,CAAC,aAAa,CAAC;IAczB;;;;;;;;;OASG;IACH,SAAS,CAAC,MAAM,CAAC,OAAO,EAAE,QAAQ,EAAE,IAAI,EAAE,WAAW,GAAG,WAAW;CAqBpE"}
+{"version":3,"file":"de-action.d.ts","sourceRoot":"","sources":["../../../../../src/service/service/entity/method/de-action.ts"],"names":[],"mappings":"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"}

package/out/service/service/entity/method/de-action.js

@@ -48,35 +48,38 @@ export class DEActionMethod extends Method {
             if (data && !this.isLocalMode) {
                 data = await this.inputHandle(context, data);
             }
-            switch (this.method.codeName) {
-                case 'Create':
+            const methodTag = this.method.actionTag
+                ? this.method.actionTag.toUpperCase()
+                : this.method.codeName.toUpperCase();
+            switch (methodTag) {
+                case 'CREATE':
                     result = await this.create(context, data, params || {}, header);
                     break;
-                case 'Get':
+                case 'GET':
                     result = await this.get(context, params, header);
                     break;
-                case 'GetDraft':
+                case 'GETDRAFT':
                     result = await this.getDraft(context, params, header);
                     break;
-                case 'Remove':
+                case 'REMOVE':
                     result = await this.remove(context, params);
                     break;
-                case 'Update':
+                case 'UPDATE':
                     result = await this.update(context, data, params, header);
                     break;
-                case 'CreateTemp':
+                case 'CREATETEMP':
                     result = await this.createTemp(context, data);
                     break;
-                case 'GetTemp':
+                case 'GETTEMP':
                     result = await this.getTemp(context, data);
                     break;
-                case 'GetDraftTemp':
+                case 'GETDRAFTTEMP':
                     result = await this.getDraftTemp(context, params);
                     break;
-                case 'RemoveTemp':
+                case 'REMOVETEMP':
                     result = await this.removeTemp(context, data);
                     break;
-                case 'UpdateTemp':
+                case 'UPDATETEMP':
                     result = await this.updateTemp(context, data);
                     break;
                 default: {
@@ -194,7 +197,9 @@ export class DEActionMethod extends Method {
             return this.getDraftTemp(context, params);
         }
         const path = this.calcPath(context);
-        const res = await this.app.net.get(`${path}/getdraft`, params, header);
+        // const res = await this.app.net.get(`${path}/getdraft`, params, header);
+        // 讲固定请求方法调整为指定的请求路径
+        const res = await this.app.net.get(this.mergeRequestPath(path, this.method.requestPath), params, header);
         res.data = await this.result.handle(context, res.data);
         return res;
     }

package/out/service/service/entity/method/method.d.ts

@@ -70,7 +70,14 @@ export declare abstract class Method {
      * @return {*}  {Promise<HttpResponse<any>>}
      */
     protected request(path: string, context: IContext, data?: IData | IData[], params?: IParams, header?: IData): Promise<HttpResponse<any>>;
-    protected mergeRequestPath(path: string, methodName: string): string;
+    /**
+     * 合并请求路径
+     * @author lionlau
+     * @param path
+     * @param methodName 方法名，以 / 开始
+     * @returns
+     */
+    protected mergeRequestPath(path: string, methodName?: string): string;
     /**
      * 根据上下文计算当前请求路径
      *

package/out/service/service/entity/method/method.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"method.d.ts","sourceRoot":"","sources":["../../../../../src/service/service/entity/method/method.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,YAAY,EAAqB,MAAM,qBAAqB,CAAC;AACtE,OAAO,EAAE,cAAc,EAAE,YAAY,EAAE,MAAM,kBAAkB,CAAC;AAEhE,OAAO,EAAE,WAAW,EAAE,MAAM,gBAAgB,CAAC;AAC7C,OAAO,EAAE,YAAY,EAAE,MAAM,kBAAkB,CAAC;AAChD,OAAO,EAAE,aAAa,EAAE,WAAW,EAAE,WAAW,EAAE,MAAM,uBAAuB,CAAC;AAEhF;;;;;;;GAOG;AACH,8BAAsB,MAAM;IAiCxB,SAAS,CAAC,OAAO,EAAE,aAAa;IAChC,SAAS,CAAC,MAAM,EAAE,cAAc;IAChC,SAAS,CAAC,MAAM,EAAE,YAAY;IAC9B,SAAS,CAAC,WAAW,EAAE,OAAO;IAnChC,SAAS,CAAC,GAAG,EAAG,WAAW,CAAC;IAE5B;;;;;;;OAOG;IACH,SAAS,CAAC,KAAK,EAAG,WAAW,CAAC;IAE9B;;;;;;;OAOG;IACH,SAAS,CAAC,MAAM,EAAG,YAAY,CAAC;IAEhC;;;;;;;;OAQG;gBAES,OAAO,EAAE,aAAa,EACtB,MAAM,EAAE,cAAc,EACtB,MAAM,EAAE,YAAY,EACpB,WAAW,GAAE,OAAe;IAOxC;;;;;;;;;;OAUG;IACH,QAAQ,CAAC,IAAI,CACX,OAAO,EAAE,QAAQ,EACjB,MAAM,CAAC,EAAE,KAAK,GAAG,KAAK,EAAE,EACxB,OAAO,CAAC,EAAE,OAAO,EACjB,MAAM,CAAC,EAAE,KAAK,GACb,OAAO,CAAC,YAAY,CAAC;IAExB;;;;;;;;;;;OAWG;cACa,OAAO,CACrB,IAAI,EAAE,MAAM,EACZ,OAAO,EAAE,QAAQ,EACjB,IAAI,CAAC,EAAE,KAAK,GAAG,KAAK,EAAE,EACtB,MAAM,CAAC,EAAE,OAAO,EAChB,MAAM,CAAC,EAAE,KAAK,GAEb,OAAO,CAAC,YAAY,CAAC,GAAG,CAAC,CAAC;IAkD7B,SAAS,CAAC,gBAAgB,CAAC,IAAI,EAAE,MAAM,EAAE,UAAU,EAAE,MAAM,GAAG,MAAM;IAIpE;;;;;;;;OAQG;IACH,SAAS,CAAC,QAAQ,CAAC,OAAO,EAAE,QAAQ,GAAG,MAAM;IAM7C;;;;;;;OAOG;IACH,SAAS,CAAC,YAAY,CACpB,IAAI,EAAE,KAAK,EAAE,GAAG,WAAW,EAAE,GAAG,KAAK,GAAG,WAAW,GAClD,WAAW,GAAG,WAAW,EAAE;CAG/B"}
+{"version":3,"file":"method.d.ts","sourceRoot":"","sources":["../../../../../src/service/service/entity/method/method.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,YAAY,EAAqB,MAAM,qBAAqB,CAAC;AACtE,OAAO,EAAE,cAAc,EAAE,YAAY,EAAE,MAAM,kBAAkB,CAAC;AAEhE,OAAO,EAAE,WAAW,EAAE,MAAM,gBAAgB,CAAC;AAC7C,OAAO,EAAE,YAAY,EAAE,MAAM,kBAAkB,CAAC;AAChD,OAAO,EAAE,aAAa,EAAE,WAAW,EAAE,WAAW,EAAE,MAAM,uBAAuB,CAAC;AAEhF;;;;;;;GAOG;AACH,8BAAsB,MAAM;IAiCxB,SAAS,CAAC,OAAO,EAAE,aAAa;IAChC,SAAS,CAAC,MAAM,EAAE,cAAc;IAChC,SAAS,CAAC,MAAM,EAAE,YAAY;IAC9B,SAAS,CAAC,WAAW,EAAE,OAAO;IAnChC,SAAS,CAAC,GAAG,EAAG,WAAW,CAAC;IAE5B;;;;;;;OAOG;IACH,SAAS,CAAC,KAAK,EAAG,WAAW,CAAC;IAE9B;;;;;;;OAOG;IACH,SAAS,CAAC,MAAM,EAAG,YAAY,CAAC;IAEhC;;;;;;;;OAQG;gBAES,OAAO,EAAE,aAAa,EACtB,MAAM,EAAE,cAAc,EACtB,MAAM,EAAE,YAAY,EACpB,WAAW,GAAE,OAAe;IAOxC;;;;;;;;;;OAUG;IACH,QAAQ,CAAC,IAAI,CACX,OAAO,EAAE,QAAQ,EACjB,MAAM,CAAC,EAAE,KAAK,GAAG,KAAK,EAAE,EACxB,OAAO,CAAC,EAAE,OAAO,EACjB,MAAM,CAAC,EAAE,KAAK,GACb,OAAO,CAAC,YAAY,CAAC;IAExB;;;;;;;;;;;OAWG;cACa,OAAO,CACrB,IAAI,EAAE,MAAM,EACZ,OAAO,EAAE,QAAQ,EACjB,IAAI,CAAC,EAAE,KAAK,GAAG,KAAK,EAAE,EACtB,MAAM,CAAC,EAAE,OAAO,EAChB,MAAM,CAAC,EAAE,KAAK,GAEb,OAAO,CAAC,YAAY,CAAC,GAAG,CAAC,CAAC;IAkD7B;;;;;;OAMG;IACH,SAAS,CAAC,gBAAgB,CAAC,IAAI,EAAE,MAAM,EAAE,UAAU,CAAC,EAAE,MAAM,GAAG,MAAM;IAIrE;;;;;;;;OAQG;IACH,SAAS,CAAC,QAAQ,CAAC,OAAO,EAAE,QAAQ,GAAG,MAAM;IAM7C;;;;;;;OAOG;IACH,SAAS,CAAC,YAAY,CACpB,IAAI,EAAE,KAAK,EAAE,GAAG,WAAW,EAAE,GAAG,KAAK,GAAG,WAAW,GAClD,WAAW,GAAG,WAAW,EAAE;CAG/B"}

package/out/service/service/entity/method/method.js

@@ -45,7 +45,7 @@ export class Method {
     async request(path, context, data, params, header) {
         const { actionType, requestMethod } = this.method;
         if (actionType === 'REMOTE') {
-            const methodName = this.method.codeName.toLowerCase();
+            const methodName = this.method.requestPath;
             let res = null;
             switch (requestMethod) {
                 case 'POST':
@@ -73,8 +73,15 @@ export class Method {
         }
         throw new RuntimeModelError(this.method, `未支持的行为类型[${actionType}]`);
     }
+    /**
+     * 合并请求路径
+     * @author lionlau
+     * @param path
+     * @param methodName 方法名，以 / 开始
+     * @returns
+     */
     mergeRequestPath(path, methodName) {
-        return `${path}/${methodName}`;
+        return methodName ? `${path}${methodName}` : `${path}`;
     }
     /**
      * 根据上下文计算当前请求路径
@@ -86,7 +93,7 @@ export class Method {
      * @return {*}  {string} 拼接结果说明: /祖父实体/祖父实体主键/爷爷实体/爷爷实体主键/父实体/父实体主键/当前实体
      */
     calcPath(context) {
-        const curPath = `/${this.entity.codeName2.toLowerCase()}`;
+        const curPath = `/${this.entity.deapicodeName2}`;
         const resPath = calcResPath(context, this.entity);
         return resPath + curPath;
     }

package/out/service/service/file/file.service.js

@@ -22,7 +22,7 @@ export class FileService {
      */
     exportData(dataExport, fetchAction, context, params) {
         const resPath = calcResPath(context, this.model);
-        const exportUrl = `${resPath}/${this.model.codeName2.toLowerCase()}/exportdata/${fetchAction.toLowerCase()}/?srfexporttag=${dataExport.codeName}`;
+        const exportUrl = `${resPath}/${this.model.deapicodeName2}/exportdata/${fetchAction.toLowerCase()}/?srfexporttag=${dataExport.codeName}`;
         return ibiz.net.request(exportUrl, {
             method: 'post',
             data: params,

package/out/ui-action/provider/front-ui-action-provider.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"front-ui-action-provider.d.ts","sourceRoot":"","sources":["../../../src/ui-action/provider/front-ui-action-provider.ts"],"names":[],"mappings":"AAMA,OAAO,EAAE,cAAc,EAAa,MAAM,kBAAkB,CAAC;AAE7D,OAAO,EAAE,cAAc,EAAE,eAAe,EAAc,MAAM,iBAAiB,CAAC;AAE9E,OAAO,EAAE,oBAAoB,EAAE,MAAM,2BAA2B,CAAC;AAEjE;;;;;;;;GAQG;AACH,qBAAa,qBAAsB,SAAQ,oBAAoB;IACvD,UAAU,CACd,MAAM,EAAE,cAAc,EACtB,IAAI,EAAE,cAAc,GACnB,OAAO,CAAC,eAAe,CAAC;IAiE3B;;;;;;;;OAQG;IAEH,SAAS,CAAC,OAAO,CACf,MAAM,EAAE,cAAc,EACtB,IAAI,EAAE,cAAc,GACnB,eAAe;IAalB;;;;;;OAMG;cACa,YAAY,CAC1B,MAAM,EAAE,cAAc,EACtB,IAAI,EAAE,cAAc,GACnB,OAAO,CAAC,IAAI,CAAC;IAiEhB;;;;;;OAMG;cACa,iBAAiB,CAC/B,MAAM,EAAE,cAAc,EACtB,IAAI,EAAE,cAAc,GACnB,OAAO,CAAC,eAAe,CAAC;IA4C3B;;;;;;OAMG;cACa,iBAAiB,CAC/B,MAAM,EAAE,cAAc,EACtB,IAAI,EAAE,cAAc,GACnB,OAAO,CAAC,IAAI,CAAC;CAqDjB"}
+{"version":3,"file":"front-ui-action-provider.d.ts","sourceRoot":"","sources":["../../../src/ui-action/provider/front-ui-action-provider.ts"],"names":[],"mappings":"AAMA,OAAO,EAAE,cAAc,EAAa,MAAM,kBAAkB,CAAC;AAE7D,OAAO,EAAE,cAAc,EAAE,eAAe,EAAc,MAAM,iBAAiB,CAAC;AAE9E,OAAO,EAAE,oBAAoB,EAAE,MAAM,2BAA2B,CAAC;AAEjE;;;;;;;;GAQG;AACH,qBAAa,qBAAsB,SAAQ,oBAAoB;IACvD,UAAU,CACd,MAAM,EAAE,cAAc,EACtB,IAAI,EAAE,cAAc,GACnB,OAAO,CAAC,eAAe,CAAC;IAiE3B;;;;;;;;OAQG;IAEH,SAAS,CAAC,OAAO,CACf,MAAM,EAAE,cAAc,EACtB,IAAI,EAAE,cAAc,GACnB,eAAe;IAalB;;;;;;OAMG;cACa,YAAY,CAC1B,MAAM,EAAE,cAAc,EACtB,IAAI,EAAE,cAAc,GACnB,OAAO,CAAC,IAAI,CAAC;IAiEhB;;;;;;OAMG;cACa,iBAAiB,CAC/B,MAAM,EAAE,cAAc,EACtB,IAAI,EAAE,cAAc,GACnB,OAAO,CAAC,eAAe,CAAC;IA4C3B;;;;;;OAMG;cACa,iBAAiB,CAC/B,MAAM,EAAE,cAAc,EACtB,IAAI,EAAE,cAAc,GACnB,OAAO,CAAC,IAAI,CAAC;CAmDjB"}

package/out/ui-action/provider/front-ui-action-provider.js

@@ -87,7 +87,7 @@ export class FrontUIActionProvider extends UIActionProviderBase {
      * @return {*}
      */
     async executePrint(action, args) {
-        var _a, _b, _c;
+        var _a, _b;
         // 处理参数
         const { resultContext, resultParams } = await this.handleParams(action, args.context, args.data, args.params);
         const appDataEntity = await ibiz.hub.getAppDataEntity(action.appDataEntityId, action.appId);
@@ -99,7 +99,7 @@ export class FrontUIActionProvider extends UIActionProviderBase {
             if (resultContext &&
                 resultContext[appDataEntity.codeName.toLowerCase()]) {
                 // TODO 临时写死printdata， 非标准，后续优化
-                requestUrl += `/${(_b = appDataEntity.codeName2) === null || _b === void 0 ? void 0 : _b.toLowerCase()}/printdata/${resultContext[appDataEntity.codeName.toLowerCase()]}`;
+                requestUrl += `/${appDataEntity.deapicodeName2}/printdata/${resultContext[appDataEntity.codeName.toLowerCase()]}`;
             }
             else {
                 throw new RuntimeError('没有找到数据主键');
@@ -114,9 +114,9 @@ export class FrontUIActionProvider extends UIActionProviderBase {
                 if (resultParams && resultParams.srfcontenttype) {
                     // 获取文件
                     const disposition = res.headers['content-disposition'];
-                    const filename = (_c = disposition
+                    const filename = (_b = disposition
                         .split(';')
-                        .find((str) => str.indexOf('filename=') !== -1)) === null || _c === void 0 ? void 0 : _c.slice(9);
+                        .find((str) => str.indexOf('filename=') !== -1)) === null || _b === void 0 ? void 0 : _b.slice(9);
                     const href = URL.createObjectURL(res.data);
                     const a = document.createElement('a');
                     a.href = href;
@@ -184,7 +184,7 @@ export class FrontUIActionProvider extends UIActionProviderBase {
      * @return {*}
      */
     async executeDataExport(action, args) {
-        var _a, _b;
+        var _a;
         // 处理参数
         const { resultParams } = await this.handleParams(action, args.context, args.data, args.params);
         const appDataEntity = await ibiz.hub.getAppDataEntity(action.appDataEntityId, action.appId);
@@ -193,7 +193,7 @@ export class FrontUIActionProvider extends UIActionProviderBase {
         });
         if (appDEDataExport) {
             // TODO 临时写死fetchdefault，应该从appDEDataExport的主表格上获取加载行为，但现在缺主表格模型，后续优化
-            const url = `/${(_b = appDataEntity.codeName2) === null || _b === void 0 ? void 0 : _b.toLowerCase()}/exportdata/fetchdefault?srfexporttag=${appDEDataExport.codeName}`;
+            const url = `/${appDataEntity.deapicodeName2}/exportdata/fetchdefault?srfexporttag=${appDEDataExport.codeName}`;
             //  参数
             const params = Object.assign(Object.assign({ page: 0, size: appDEDataExport.maxRowCount ? appDEDataExport.maxRowCount : 1000 }, args.params), resultParams);
             const res = await ibiz.net.request(url, {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@ibiz-template/runtime",
-  "version": "0.6.5",
+  "version": "0.6.7",
   "description": "控制器包",
   "type": "module",
   "main": "out/index.js",
@@ -65,6 +65,5 @@
     "qs": "^6.11.0",
     "qx-util": "^0.4.8",
     "ramda": "^0.29.0"
-  },
-  "gitHead": "cce7f66fe82ec7d7e111deef965c619b0cc0a16b"
+  }
 }