@ibiz-template/runtime 0.1.12-dev.0 → 0.1.13

package/src/engine/md-view.engine.ts

@@ -213,7 +213,9 @@ export class MDViewEngine extends ViewEngineBase {
       view: this.view,
     });
 
-    if (result === -1) {
+    if (result instanceof Object && result.ok) {
+      this.refresh();
+    } else if (result === -1) {
       ibiz.log.warn(`视图[${this.view.model.codeName}]，未配置编辑打开视图`);
     }
   }
@@ -253,7 +255,9 @@ export class MDViewEngine extends ViewEngineBase {
       view: this.view,
     });
 
-    if (result === -1) {
+    if (result instanceof Object && result.ok) {
+      this.refresh();
+    } else if (result === -1) {
       throw new RuntimeModelError(this.view.model, `缺少newdata的视图逻辑`);
     }
   }
@@ -356,7 +360,7 @@ export class MDViewEngine extends ViewEngineBase {
   protected calcViewHeaderVisible(): boolean {
     let showHeader = super.calcViewHeaderVisible();
     // 搜索栏
-    if (!this.searchBar) {
+    if (!this.searchBar || !this.searchBar.state.visible) {
       const controller = this.viewLayoutPanel!.panelItems.view_searchbar;
       if (controller) {
         controller.state.visible = false;

package/src/global/global-util/global-util.ts

@@ -1,5 +1,5 @@
 import { IExportExcelUtil } from '../../interface';
-import { TextUtil, LayoutPanelUtil } from '../../utils';
+import { TextUtil, LayoutPanelUtil, HandlebarsUtil } from '../../utils';
 
 /**
  * 全局工具方法或对象
@@ -26,6 +26,14 @@ export class GlobalUtil {
    */
   readonly text = new TextUtil();
 
+  /**
+   * handlebars 工具
+   *
+   * @author chitanda
+   * @date 2023-08-28 23:08:59
+   */
+  readonly hbs = new HandlebarsUtil();
+
   /**
    * 获取导出Excel工具类对象
    * @author lxm

package/src/hub/config/app-view-config-service.ts

@@ -24,6 +24,7 @@ export class AppViewConfigService implements IAppViewConfigService {
         id: model.id!,
         codeName: model.codeName!,
         openMode: model.openMode!,
+        viewType: model.viewType!,
         width: model.width,
         height: model.height,
         appDataEntityId: model.appDataEntityId,

package/src/interface/common/i-app-view-config-service/i-app-view-config-service.ts

@@ -18,6 +18,10 @@ export interface IViewConfig {
    * 打开方式
    */
   openMode: string;
+  /**
+   * 视图类型
+   */
+  viewType: string;
   /**
    * 宽度
    */

package/src/interface/controller/event/control/i-edit-form.event.ts

@@ -11,11 +11,11 @@ import { IFormEvent } from './i-form.event';
  */
 export interface IEditFormEvent extends IFormEvent {
   /**
-   * 加载草稿成功后
+   * 加载之前
    *
    * @author lxm
    */
-  onLoadDraftSuccess: {
+  onBeforeLoad: {
     event: EventBase;
     emitArgs: undefined;
   };
@@ -30,6 +30,26 @@ export interface IEditFormEvent extends IFormEvent {
     emitArgs: undefined;
   };
 
+  /**
+   * 加载失败
+   *
+   * @author lxm
+   */
+  onLoadError: {
+    event: EventBase;
+    emitArgs: undefined;
+  };
+
+  /**
+   * 保存之前
+   *
+   * @author lxm
+   */
+  onBeforeSave: {
+    event: EventBase;
+    emitArgs: undefined;
+  };
+
   /**
    * 保存成功后
    *
@@ -41,7 +61,27 @@ export interface IEditFormEvent extends IFormEvent {
   };
 
   /**
-   * 删除之后事件
+   * 保存失败
+   *
+   * @author lxm
+   */
+  onSaveError: {
+    event: EventBase;
+    emitArgs: undefined;
+  };
+
+  /**
+   * 删除之前
+   *
+   * @author lxm
+   */
+  onBeforeRemove: {
+    event: EventBase;
+    emitArgs: undefined;
+  };
+
+  /**
+   * 删除成功之后
    *
    * @author lxm
    */
@@ -49,4 +89,14 @@ export interface IEditFormEvent extends IFormEvent {
     event: EventBase;
     emitArgs: undefined;
   };
+
+  /**
+   * 删除失败
+   *
+   * @author lxm
+   */
+  onRemoveError: {
+    event: EventBase;
+    emitArgs: undefined;
+  };
 }

package/src/interface/controller/event/control/i-form.event.ts

@@ -21,4 +21,34 @@ export interface IFormEvent extends IControlEvent {
     event: EventBase;
     emitArgs: undefined;
   };
+
+  /**
+   * 加载草稿之前
+   *
+   * @author lxm
+   */
+  onBeforeLoadDraft: {
+    event: EventBase;
+    emitArgs: Partial<EventBase>;
+  };
+
+  /**
+   * 加载草稿成功后
+   *
+   * @author lxm
+   */
+  onLoadDraftSuccess: {
+    event: EventBase;
+    emitArgs: undefined;
+  };
+
+  /**
+   * 加载草稿失败
+   *
+   * @author lxm
+   */
+  onLoadDraftError: {
+    event: EventBase;
+    emitArgs: undefined;
+  };
 }

package/src/interface/controller/event/control/i-md-control.event.ts

@@ -11,17 +11,6 @@ import { IControlEvent } from './i-control.event';
  * @interface IMDControlEvent
  */
 export interface IMDControlEvent extends IControlEvent {
-  /**
-   * 加载前事件，返回值是视图参数
-   *
-   * @author lxm
-   * @date 2022-08-30 16:08:18
-   */
-  onBeforeLoad: {
-    event: EventBase;
-    emitArgs: undefined;
-  };
-
   /**
    * 数据激活事件
    *
@@ -45,10 +34,19 @@ export interface IMDControlEvent extends IControlEvent {
   };
 
   /**
-   * 保存后处理事件
+   * 保存之前
+   *
+   * @author lxm
+   */
+  onBeforeSave: {
+    event: EventBase;
+    emitArgs: undefined;
+  };
+
+  /**
+   * 保存成功后
    *
    * @author lxm
-   * @date 2022-11-15 16:11:22
    */
   onSaveSuccess: {
     event: EventBase;
@@ -56,16 +54,56 @@ export interface IMDControlEvent extends IControlEvent {
   };
 
   /**
-   * 删除后处理事件
+   * 保存失败
+   *
+   * @author lxm
+   */
+  onSaveError: {
+    event: EventBase;
+    emitArgs: undefined;
+  };
+
+  /**
+   * 删除之前
+   *
+   * @author lxm
+   */
+  onBeforeRemove: {
+    event: EventBase;
+    emitArgs: undefined;
+  };
+
+  /**
+   * 删除成功之后
    *
    * @author lxm
-   * @date 2022-11-15 18:11:14
    */
   onRemoveSuccess: {
     event: EventBase;
     emitArgs: undefined;
   };
 
+  /**
+   * 删除失败
+   *
+   * @author lxm
+   */
+  onRemoveError: {
+    event: EventBase;
+    emitArgs: undefined;
+  };
+
+  /**
+   * 加载前事件
+   *
+   * @author lxm
+   * @date 2022-08-30 16:08:18
+   */
+  onBeforeLoad: {
+    event: EventBase;
+    emitArgs: undefined;
+  };
+
   /**
    * 加载后处理事件
    *
@@ -76,4 +114,14 @@ export interface IMDControlEvent extends IControlEvent {
     event: LoadEvent;
     emitArgs: PartialWithObject<LoadEvent, EventBase>;
   };
+
+  /**
+   * 加载失败
+   *
+   * @author lxm
+   */
+  onLoadError: {
+    event: EventBase;
+    emitArgs: undefined;
+  };
 }

package/src/interface/controller/state/control/i-exp-bar-control.state.ts

@@ -17,4 +17,12 @@ export interface IExpBarControlState extends IControlState {
    * @type {string}
    */
   query: string;
+
+  /**
+   * 占位符
+   *
+   * @type {string}
+   * @memberof IExpBarControlState
+   */
+  placeHolder: string;
 }

package/src/interface/controller/state/control/i-search-bar.state.ts

@@ -8,4 +8,12 @@ export interface ISearchBarState extends IControlState {
    * @Date: 2023-06-01 17:51:04
    */
   query: string;
+
+  /**
+   * 是否显示
+   * @author lxm
+   * @date 2023-08-25 05:32:59
+   * @type {boolean}
+   */
+  visible: boolean;
 }

package/src/logic-scheduler/executor/app-ui-logic-executor.ts

@@ -59,7 +59,7 @@ export class AppUILogicExecutor extends LogicExecutor {
   async executeOpenDataAppUILogic(
     appUILogic: IAppUIOpenDataLogic,
     parameters: IUILogicParams,
-  ): Promise<void> {
+  ): Promise<IModalData> {
     const { context, params, ...rest } = parameters;
     const { data } = parameters;
     if (!data?.[0]) {
@@ -97,7 +97,7 @@ export class AppUILogicExecutor extends LogicExecutor {
     }
 
     // 打开视图
-    await ibiz.commands.execute(
+    return ibiz.commands.execute(
       OpenAppViewCommand.TAG,
       openView,
       tempContext,
@@ -121,7 +121,7 @@ export class AppUILogicExecutor extends LogicExecutor {
   async executeNewDataAppUILogic(
     appUILogic: IAppUINewDataLogic,
     parameters: IUILogicParams,
-  ): Promise<void> {
+  ): Promise<IModalData> {
     const { context, params, ...rest } = parameters;
     const { data } = parameters;
     const { enableWizardAdd, enableBatchAdd, batchAddOnly, newDataAppView } =
@@ -132,7 +132,7 @@ export class AppUILogicExecutor extends LogicExecutor {
       newViewRef = await this.getWizardNewViewRef(appUILogic, parameters);
       if (!newViewRef) {
         // 选择视图取消操作直接返回
-        return;
+        return { ok: false };
       }
     } else if (enableBatchAdd) {
       // todo 批添加
@@ -174,7 +174,7 @@ export class AppUILogicExecutor extends LogicExecutor {
     }
 
     // 打开视图
-    await ibiz.commands.execute(
+    return ibiz.commands.execute(
       OpenAppViewCommand.TAG,
       newViewRef.refAppViewId,
       tempContext,

package/src/service/service/code-list/code-list.service.ts

@@ -101,10 +101,7 @@ export class CodeListService {
       // todo代码项其他属性，表单数据
       let text = codeItem.text!;
       if (codeItem.textLanguageRes) {
-        text = ibiz.i18n.t(
-          codeItem.textLanguageRes.lanResTag!,
-          codeItem.textLanguageRes.defaultContent,
-        );
+        text = ibiz.i18n.t(codeItem.textLanguageRes.lanResTag!, codeItem.text);
       }
       const _codeItem: CodeListItem = {
         text,

package/src/service/service/entity/method/method.ts

@@ -121,20 +121,16 @@ export abstract class Method {
       let res: HttpResponse | null = null;
       switch (requestMethod) {
         case 'POST':
-          res = await this.app.net.post(`${path}/${methodName}`, data, params);
+          res = await this.app.net.post(`${path}/${methodName}`, data);
           break;
         case 'GET':
-          res = await this.app.net.get(`${path}/${methodName}`, data, params);
+          res = await this.app.net.get(`${path}/${methodName}`, params);
           break;
         case 'PUT':
-          res = await this.app.net.put(`${path}/${methodName}`, data, params);
+          res = await this.app.net.put(`${path}/${methodName}`, data);
           break;
         case 'DELETE':
-          res = await this.app.net.delete(
-            `${path}/${methodName}`,
-            data,
-            params,
-          );
+          res = await this.app.net.delete(`${path}/${methodName}`, params);
           break;
         default:
           if (requestMethod) {

package/src/service/utils/dynamic-code-list/dynamic-code-list.ts

@@ -161,7 +161,7 @@ export class DynamicCodeListCache {
     if (this.isPredefined) {
       // 特殊处理，避免预置代码表加载不全
       if (!params.size) {
-        params.size = 10000;
+        params = { ...params, size: 10000 };
       }
       const res = await app.net.get(
         `/dictionaries/codelist/${this.codeList.codeName}`,

package/src/service/utils/index.ts

@@ -4,5 +4,4 @@ export { DEDQCondUtil } from './de-dq-cond-util/de-dq-cond-util';
 export { DynamicCodeListCache } from './dynamic-code-list/dynamic-code-list';
 export { DECache } from './de-cache/de-cache';
 export { getMatchResPath, calcResPath } from './res-path/res-path';
-export { calcRouteContext } from './route-context/route-context';
 export { SearchFilter } from './search-filter/search-filter';

package/src/ui-action/provider/backend-ui-action-provider.ts

@@ -33,7 +33,6 @@ export class BackendUIActionProvider extends UIActionProviderBase {
       data,
       params,
     );
-    const tempParams = { ...params, ...resultParams };
 
     // 如果有打开视图，打开视图，并把返回的数据作为子实体数据
     const frontPSAppView = action.frontAppViewId;
@@ -71,7 +70,7 @@ export class BackendUIActionProvider extends UIActionProviderBase {
       methodName,
       resultContext,
       isMultiData ? _data : _data[0],
-      tempParams,
+      resultParams,
     );
 
     // 适配界面行为成功提示信息
@@ -81,7 +80,7 @@ export class BackendUIActionProvider extends UIActionProviderBase {
     Object.assign(actionResult, {
       data: isArray(res.data) ? res.data : [res.data],
       nextContext: resultContext,
-      nextParams: tempParams,
+      nextParams: resultParams,
     });
 
     return actionResult;

package/src/ui-action/uiaction-util.ts

@@ -49,7 +49,7 @@ export class UIActionUtil {
   ): Promise<void> {
     const result = await this.exec(actionId, params);
     if (result.closeView) {
-      params.view.closeView();
+      params.view.closeView({ ok: true });
     } else if (result.refresh) {
       switch (result.refreshMode) {
         case 1:

package/src/utils/handlebars/handlebars.ts

@@ -0,0 +1,70 @@
+/**
+ * handlebars 渲染工具类
+ *
+ * @author chitanda
+ * @date 2023-08-28 17:08:13
+ * @export
+ * @class HandlebarsUtil
+ */
+export class HandlebarsUtil {
+  // eslint-disable-next-line @typescript-eslint/no-explicit-any
+  protected hsb: any;
+
+  /**
+   * handlebars 是否已经初始化
+   *
+   * @author chitanda
+   * @date 2023-08-28 18:08:01
+   * @readonly
+   * @type {boolean}
+   */
+  get isInit(): boolean {
+    return !!this.hsb;
+  }
+
+  /**
+   * 异步加载，初始化 handlebars
+   *
+   * @author chitanda
+   * @date 2023-08-28 17:08:24
+   * @return {*}  {Promise<void>}
+   */
+  async init(): Promise<void> {
+    this.hsb = await import('handlebars');
+  }
+
+  /**
+   * 异步绘制模板，返回渲染后的字符串
+   *
+   * @author chitanda
+   * @date 2023-08-28 18:08:10
+   * @param {string} template
+   * @param {IData} data
+   * @return {*}  {Promise<string>}
+   */
+  async render(template: string, data: IData): Promise<string> {
+    if (!this.hsb) {
+      await this.init();
+    }
+    const tmp = this.hsb.compile(template);
+    return tmp(data);
+  }
+
+  /**
+   * 同步绘制模板，返回渲染后的字符串
+   *
+   * @description 需要自己保证 handlebars 已经加载
+   * @author chitanda
+   * @date 2023-08-28 18:08:14
+   * @param {string} template
+   * @param {IData} data
+   * @return {*}  {string}
+   */
+  syncRender(template: string, data: IData): string {
+    if (!this.hsb) {
+      throw new Error('handlebars not init');
+    }
+    const tmp = this.hsb.compile(template);
+    return tmp(data);
+  }
+}

package/src/utils/index.ts

@@ -1,3 +1,4 @@
+export { HandlebarsUtil } from './handlebars/handlebars';
 export { calcNavParams } from './nav-params/calc-nav-params';
 export * from './nav-params/nav-params';
 export {

package/src/utils/script/script-function.ts

@@ -142,6 +142,9 @@ export class ScriptFunction {
           openView: ibiz.openView,
         };
         break;
+      case 'viewParam': // 视图参数
+        param.viewParam = param.params;
+        break;
       case 'env': // 全局环境变量
         param.env = ibiz.env;
         break;

package/src/utils/text-util/text-util.ts

@@ -19,4 +19,16 @@ export class TextUtil {
   format(value: string, _code: string): string {
     return value;
   }
+
+  /**
+   * 拷贝文本
+   *
+   * @author zhanghengfeng
+   * @date 2023-08-28 14:08:57
+   * @param {string} value
+   * @return {*}  {Promise<void>}
+   */
+  async copy(value: string): Promise<void> {
+    return navigator.clipboard.writeText(value);
+  }
 }

package/out/service/utils/route-context/route-context.d.ts

@@ -1,20 +0,0 @@
-import { IAppView } from '@ibiz/model-core';
-/**
- * 计算资源上下文时，需要排除自身实体codeName的视图（导航类视图和多数据视图）
- * @return {*}
- * @author: zhujiamin
- * @Date: 2023-02-20 15:45:46
- */
-export declare const excludeViewTypes: string[];
-/**
- * 计算放置到路径中的资源上下文参数
- *
- * @author chitanda
- * @date 2023-01-10 14:01:51
- * @export
- * @param {IParams} context
- * @param {ServicePathItem[][]} pathItems
- * @return {*}  {Record<string, unknown>}
- */
-export declare function calcRouteContext(_appView?: IAppView): Record<string, unknown>;
-//# sourceMappingURL=route-context.d.ts.map

package/out/service/utils/route-context/route-context.d.ts.map

@@ -1 +0,0 @@
-{"version":3,"file":"route-context.d.ts","sourceRoot":"","sources":["../../../../src/service/utils/route-context/route-context.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,QAAQ,EAAE,MAAM,kBAAkB,CAAC;AAG5C;;;;;GAKG;AACH,eAAO,MAAM,gBAAgB,EAAE,MAAM,EAYpC,CAAC;AAEF;;;;;;;;;GASG;AACH,wBAAgB,gBAAgB,CAG9B,QAAQ,CAAC,EAAE,QAAQ,GAClB,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAqCzB"}

package/out/service/utils/route-context/route-context.js

@@ -1,71 +0,0 @@
-import { ViewType } from '../../../constant';
-/**
- * 计算资源上下文时，需要排除自身实体codeName的视图（导航类视图和多数据视图）
- * @return {*}
- * @author: zhujiamin
- * @Date: 2023-02-20 15:45:46
- */
-export const excludeViewTypes = [
-    ViewType.DE_GRID_VIEW,
-    ViewType.DE_GRID_EXP_VIEW,
-    ViewType.DE_LIST_VIEW,
-    ViewType.DE_LIST_EXP_VIEW,
-    ViewType.DE_DATA_VIEW,
-    ViewType.DE_DATAVIEW_EXP_VIEW,
-    ViewType.DE_CALENDAR_VIEW,
-    ViewType.DE_CALENDAR_EXP_VIEW,
-    ViewType.DE_CHART_VIEW,
-    ViewType.DE_CHART_EXP_VIEW,
-    ViewType.DE_KANBAN_VIEW,
-];
-/**
- * 计算放置到路径中的资源上下文参数
- *
- * @author chitanda
- * @date 2023-01-10 14:01:51
- * @export
- * @param {IParams} context
- * @param {ServicePathItem[][]} pathItems
- * @return {*}  {Record<string, unknown>}
- */
-export function calcRouteContext(
-// context: IParams,
-// pathItems: ServicePathItem[][],
-_appView) {
-    let paths = [];
-    // pathItems.forEach(items => {
-    //   const values: string[][] = [];
-    //   for (let i = 0; i < items.length; i++) {
-    //     const arr: string[] = [];
-    //     const item = items[i];
-    //     if (
-    //       appView &&
-    //       appView.viewType &&
-    //       excludeViewTypes.includes(appView.viewType)
-    //     ) {
-    //       // 排除导航类视图和多数据视图自身
-    //       const deName = appView.getPSAppDataEntity()?.codeName.toLowerCase();
-    //       if (deName === item.name) {
-    //         return;
-    //       }
-    //     }
-    //     const val = context[item.lower];
-    //     if (val) {
-    //       arr.push(item.lower);
-    //       arr.push(val);
-    //       values.push(arr);
-    //     }
-    //   }
-    //   paths.push(values);
-    // });
-    paths = paths.sort((a, b) => b.length - a.length);
-    const [pathArr] = paths;
-    if (pathArr) {
-        const obj = {};
-        pathArr.forEach(([key, val]) => {
-            obj[key] = val;
-        });
-        return obj;
-    }
-    return {};
-}