@ibiz-template/runtime 0.1.36 → 0.1.38

package/src/controller/control/medit-view-panel/medit-view-panel.controller.ts

@@ -0,0 +1,305 @@
+/* eslint-disable no-shadow */
+import { RuntimeError } from '@ibiz-template/core';
+import { IDEMultiEditViewPanel } from '@ibiz/model-core';
+import { createUUID } from 'qx-util';
+import {
+  IMEditViewPanelState,
+  IMEditViewPanelEvent,
+  IMEditViewPanelController,
+  MDCtrlLoadParams,
+  IPanelUiItem,
+  DataChangeEvent,
+} from '../../../interface';
+import { calcDeCodeNameById } from '../../../model';
+import { ControlVO, Srfuf } from '../../../service';
+import { MDControlController } from '../../common';
+import { MEditViewPanelService } from './medit-view-panel.service';
+
+/**
+ * 多编辑视图面板部件控制器
+ * @export
+ * @class MEditViewPanelController
+ * @extends {MDControlController<IDEMultiEditViewPanel, IMEditViewPanelState, IMEditViewPanelEvent>}
+ * @implements {IMEditViewPanelController}
+ */
+export class MEditViewPanelController
+  extends MDControlController<
+    IDEMultiEditViewPanel,
+    IMEditViewPanelState,
+    IMEditViewPanelEvent
+  >
+  implements IMEditViewPanelController
+{
+  declare service: MEditViewPanelService;
+
+  /**
+   * 是否显示底部按钮
+   *
+   */
+  showButton: boolean = true;
+
+  /**
+   * 当前应用视图参数对象
+   *
+   */
+  parameters: IData[] = [];
+
+  protected async onCreated(): Promise<void> {
+    await super.onCreated();
+    this.service = new MEditViewPanelService(this.model);
+    await this.service.init(this.context);
+    await this.initParameters();
+  }
+
+  protected initState(): void {
+    super.initState();
+    this.state.panelUiItems = [];
+    this.state.activeTab = '';
+    this.state.size = 1000;
+  }
+
+  /**
+   * 初始化嵌入应用视图及实体参数对象
+   * @return {*}
+   * @author: zhujiamin
+   * @Date: 2023-10-16 13:56:56
+   */
+  async initParameters(): Promise<void> {
+    if (this.model.embeddedAppViewId) {
+      const embedView = await ibiz.hub.getAppView(this.model.embeddedAppViewId);
+      if (embedView.appDataEntityId) {
+        const embedViewEntity = await ibiz.hub.getAppDataEntity(
+          embedView.appDataEntityId,
+        );
+        if (embedView && embedViewEntity) {
+          this.parameters = [
+            {
+              parameterName: embedViewEntity.keyAppDEFieldId?.toLowerCase(),
+              pathName: embedViewEntity.codeName?.toLowerCase(),
+            },
+          ];
+        } else {
+          this.parameters = [];
+        }
+      }
+    }
+  }
+
+  /**
+   * 部件加载后处理
+   *
+   * @author chitanda
+   * @date 2023-06-21 15:06:44
+   * @param {MDCtrlLoadParams} args 本次请求参数
+   * @param {IData[]} items 上游处理的数据（默认是后台数据）
+   * @return {*}  {Promise<IData[]>} 返回给后续处理的数据
+   */
+  async afterLoad(
+    args: MDCtrlLoadParams,
+    items: ControlVO[],
+  ): Promise<ControlVO[]> {
+    await super.afterLoad(args, items);
+    this.state.panelUiItems = [];
+    this.doItems(items);
+    // 设置默认激活
+    if (
+      this.model.panelStyle === 'TAB_TOP' &&
+      this.state.panelUiItems.length > 0
+    ) {
+      this.state.activeTab = this.state.panelUiItems[0].id;
+    }
+    return items;
+  }
+
+  /**
+   * 处理UI所需数据
+   * @param {ControlVO} arg
+   * @return {*}
+   * @author: zhujiamin
+   * @Date: 2023-10-16 17:55:31
+   */
+  handlePanelItemParams(arg: ControlVO): IPanelUiItem {
+    const [{ parameterName }] = this.parameters;
+    const id: string = arg[parameterName]
+      ? arg[parameterName]
+      : `mockId:${createUUID()}`;
+    const item = {
+      id,
+      context: this.context.clone(),
+      params: {},
+      data: arg,
+      srfmajortext: '',
+    };
+
+    // 当前视图参数（应用实体视图）
+    this.parameters.forEach(parameter => {
+      const { parameterName, pathName } = parameter;
+      if (arg[parameterName] && !Object.is(arg[parameterName], '')) {
+        Object.assign(item.context, {
+          [pathName]: arg[parameterName],
+        });
+      }
+
+      // 当前页面实体主信息
+      if (arg.srfmajortext && !Object.is(arg.srfmajortext, '')) {
+        Object.assign(item, { srfmajortext: arg.srfmajortext });
+      } else if (arg.srfuf === 0) {
+        Object.assign(item, { srfmajortext: '草稿--新建' });
+      }
+    });
+
+    return item;
+  }
+
+  /**
+   * 处理数据
+   * @param {ControlVO} datas
+   * @return {*}
+   * @author: zhujiamin
+   * @Date: 2023-10-16 15:00:02
+   */
+  doItems(datas: ControlVO[]): void {
+    datas.forEach((arg: ControlVO) => {
+      const item = this.handlePanelItemParams(arg);
+      this.state.panelUiItems.push(item);
+    });
+  }
+
+  /**
+   * 处理添加
+   * @return {*}
+   * @author: zhujiamin
+   * @Date: 2023-10-16 15:18:01
+   */
+  async handleAdd(): Promise<void> {
+    this.doItems([{ srfuf: 0 } as ControlVO]);
+    if (this.model.panelStyle === 'TAB_TOP') {
+      // 上分页添加后激活最后一个
+      this.state.activeTab =
+        this.state.panelUiItems[this.state.panelUiItems.length - 1].id;
+    }
+  }
+
+  /**
+   * 处理删除
+   * @param {IPanelUiItem} item
+   * @return {*}
+   * @author: zhujiamin
+   * @Date: 2023-10-16 15:23:59
+   */
+  async handleDelete(item: IPanelUiItem): Promise<void> {
+    // 新建的界面上删除即可
+    if (item.data.srfuf === 0) {
+      // 删除items中已删除的项
+      const index = this.state.panelUiItems.findIndex(value => {
+        return value === item;
+      });
+      this.state.panelUiItems.splice(index, 1);
+    } else {
+      await this.remove({ data: [item.data] });
+    }
+  }
+
+  /**
+   * 处理tab删除
+   * @param {IPanelUiItem} item
+   * @return {*}
+   * @author: zhujiamin
+   * @Date: 2023-10-17 14:21:57
+   */
+  async handleTabDelete(item: IPanelUiItem, index: number): Promise<void> {
+    let isBackToEnd = false;
+    // 如果删除的是激活项，且为最后一项，设置激活项为前一项
+    if (
+      item.id === this.state.activeTab &&
+      index === this.state.panelUiItems.length - 1
+    ) {
+      if (index > 0) {
+        isBackToEnd = true;
+      }
+    }
+    await this.handleDelete(item);
+    if (isBackToEnd) {
+      this.state.activeTab =
+        this.state.panelUiItems[this.state.panelUiItems.length - 1].id;
+    }
+  }
+
+  /**
+   * 后台删除结束后界面删除逻辑
+   *
+   * @author lxm
+   * @date 2022-09-06 19:09:10
+   * @param {IData} data
+   */
+  afterRemove(data: IData): void {
+    super.afterRemove(data);
+    // 删除this.items里的数据
+    const index = this.state.panelUiItems.findIndex(
+      item => item.data.srfkey === data.srfkey,
+    );
+    if (index !== -1) {
+      this.state.panelUiItems.splice(index, 1);
+    }
+  }
+
+  /**
+   * 视图数据变化
+   * @param {DataChangeEvent} args
+   * @return {*}
+   * @author: zhujiamin
+   * @Date: 2023-10-16 17:20:45
+   */
+  onViewDataChange(args: DataChangeEvent, id: string): void {
+    // 新建的保存成功后该部件需要保存来更新数据
+    if (args.eventName === 'onSaveSuccess') {
+      this.save(args.data[0] as ControlVO, id);
+    }
+  }
+
+  /**
+   * 保存
+   *
+   * @param {ControlVO} data
+   * @returns {*}  {Promise<void>}
+   */
+  async save(data: ControlVO, id: string): Promise<void> {
+    const panelUiItemIndex = this.state.panelUiItems.findIndex(
+      item => item.id === id,
+    );
+    if (!panelUiItemIndex) {
+      throw new RuntimeError('编辑视图面板部件UI数据不存在');
+    }
+    await this.startLoading();
+    let res;
+    const isCreate = data.srfuf === Srfuf.CREATE;
+    const deName = calcDeCodeNameById(this.model.appDataEntityId!);
+    const tempContext = this.context.clone();
+    tempContext[deName] = data.srfkey;
+    try {
+      res = isCreate
+        ? await this.service.create(tempContext, data)
+        : await this.service.update(tempContext, data);
+    } catch (error) {
+      await this.evt.emit('onSaveError', undefined);
+      this.actionNotification(`${isCreate ? 'CREATE' : 'UPDATE'}ERROR`, {
+        error: error as Error,
+        data: this.state.panelUiItems[panelUiItemIndex].data,
+      });
+      throw error;
+    } finally {
+      await this.endLoading();
+    }
+    // 后续处理
+    const index = this.state.items.findIndex(
+      item => item.srfkey === data.srfkey,
+    );
+    this.state.items.splice(index, 1, res.data);
+    this.state.panelUiItems.splice(
+      panelUiItemIndex,
+      1,
+      this.handlePanelItemParams(res.data),
+    );
+    await this.evt.emit('onSaveSuccess', undefined);
+  }
+}

package/src/controller/control/medit-view-panel/medit-view-panel.service.ts

@@ -0,0 +1,10 @@
+import { IDEMultiEditViewPanel } from '@ibiz/model-core';
+import { MDControlService } from '../../../service';
+
+/**
+ * 多编辑视图面板部件服务
+ *
+ * @export
+ * @extends {MDControlService<IDEMultiEditViewPanel>}
+ */
+export class MEditViewPanelService extends MDControlService<IDEMultiEditViewPanel> {}

package/src/controller/control/search-bar/search-bar.controller.ts

@@ -7,6 +7,7 @@ import {
   ISearchBarController,
   IFilterNode,
 } from '../../../interface';
+import { convertNavData, ScriptFactory } from '../../../utils';
 import { ControlController } from '../../common';
 import { SearchBarFilterController } from './search-bar-filter.controller';
 
@@ -144,11 +145,11 @@ export class SearchBarController
     }
     // 快速分组
     if (this.state.selectedGroupItem?.data) {
-      // eslint-disable-next-line no-new-func
-      const func = new Function(
-        `return (${this.state.selectedGroupItem.data});`,
-      );
-      const addParams = func() as IData;
+      const navParams = ScriptFactory.execSingleLine(
+        this.state.selectedGroupItem.data,
+      ) as IData;
+
+      const addParams = convertNavData(navParams, this.params, this.context);
       Object.assign(params, addParams);
     }
 

package/src/controller/utils/value-rule/value-rule.ts

@@ -1,7 +1,14 @@
 /* eslint-disable @typescript-eslint/no-unused-vars */
 import { RuntimeError } from '@ibiz-template/core';
-import { IDEFormItemVR, IDEGridEditItemVR } from '@ibiz/model-core';
-import { isNilOrEmpty } from 'qx-util';
+import {
+  IDEFormItemVR,
+  IDEGridEditItemVR,
+  IEditor,
+  INumberEditor,
+  ITextEditor,
+} from '@ibiz/model-core';
+import { isNilOrEmpty, isNumber } from 'qx-util';
+import { isNil } from 'ramda';
 import { ScriptFactory, verifyDeRules } from '../../../utils';
 
 /**
@@ -93,3 +100,91 @@ export function generateRules(
   });
   return rules;
 }
+
+/**
+ * 生成编辑器相关的值规则
+ * @author lxm
+ * @date 2023-10-18 03:36:39
+ * @export
+ * @param {IEditor} editor
+ * @return {*}  {IData[]}
+ */
+export function generateEditorRules(editor: IEditor): IData[] {
+  const rules: IData[] = [];
+  const { maxLength, minLength } = editor as ITextEditor;
+  const { maxValue, minValue } = editor as INumberEditor;
+
+  if (maxLength) {
+    rules.push({
+      validator: (
+        rule: IData,
+        value: IData,
+        callback: (params: Error[] | Error) => boolean,
+      ) => {
+        if (!isNil(value) && value.length > maxLength) {
+          callback(
+            new Error(
+              `内容长度必须小于等于${maxLength},当前长度为${value.length}`,
+            ),
+          );
+        } else {
+          return true;
+        }
+      },
+    });
+  }
+
+  if (minLength) {
+    rules.push({
+      validator: (
+        rule: IData,
+        value: IData,
+        callback: (params: Error[] | Error) => boolean,
+      ) => {
+        if (!isNil(value) && value.length < minLength) {
+          callback(
+            new Error(
+              `内容长度必须大于等于${minLength},当前长度为${value.length}`,
+            ),
+          );
+        } else {
+          return true;
+        }
+      },
+    });
+  }
+
+  if (!isNil(maxValue)) {
+    rules.push({
+      validator: (
+        rule: IData,
+        value: number,
+        callback: (params: Error[] | Error) => boolean,
+      ) => {
+        if (!isNil(value) && isNumber(value) && value > maxValue) {
+          callback(new Error(`值必须小于等于${maxValue}`));
+        } else {
+          return true;
+        }
+      },
+    });
+  }
+
+  if (!isNil(minValue)) {
+    rules.push({
+      validator: (
+        rule: IData,
+        value: number,
+        callback: (params: Error[] | Error) => boolean,
+      ) => {
+        if (!isNil(value) && isNumber(value) && value < minValue) {
+          callback(new Error(`值必须大于等于${minValue}`));
+        } else {
+          return true;
+        }
+      },
+    });
+  }
+
+  return rules;
+}

package/src/de-logic/de-logic-context.ts

@@ -1,3 +1,4 @@
+import { isArray } from 'lodash-es';
 import { DELogicParam } from './de-logic-param/de-logic-param';
 
 /**
@@ -21,9 +22,9 @@ export class DELogicContext {
    * 实体逻辑执行参数
    * @author lxm
    * @date 2023-10-16 02:22:31
-   * @type {{ context: IParams; data: IData; params: IParams }}
+   * @type {{ context: IParams; data: IData[]; params: IParams }}
    */
-  parameters: { context: IParams; data: IData; params: IParams };
+  parameters: { context: IParams; data: IData[]; params: IParams };
 
   /**
    * 上下文
@@ -38,7 +39,7 @@ export class DELogicContext {
   /**
    * 数据
    */
-  get data(): IData {
+  get data(): IData[] {
     return this.parameters.data;
   }
 
@@ -64,10 +65,10 @@ export class DELogicContext {
   constructor(
     private deLogicParams: Map<string, DELogicParam>,
     context: IParams,
-    data: IData,
+    data: IData | IData[],
     params: IParams,
   ) {
-    this.parameters = { context, data, params };
+    this.parameters = { context, data: isArray(data) ? data : [data], params };
   }
 
   /**

package/src/de-logic/de-logic-link/de-logic-link.ts

@@ -68,6 +68,6 @@ export class DELogicLink {
       return true;
     }
     // 常规
-    return this.groupCond.test(ctx, ctx.context, ctx.data || {});
+    return this.groupCond.test(ctx, ctx.context, ctx.data[0] || {});
   }
 }

package/src/de-logic/de-logic-param/de-logic-param.ts

@@ -35,7 +35,12 @@ export class DELogicParam {
     const tag = this.model.id!;
     const m = this.model;
     if (m.default) {
-      ctx.params[tag] = ctx.data || {};
+      // 配置了列表的拿数组数据
+      if (m.entityListParam) {
+        ctx.params[tag] = ctx.data || [];
+      } else {
+        ctx.params[tag] = ctx.data[0] || {};
+      }
     } else if (m.appGlobalParam) {
       // 应用全局变量
       ctx.params[tag] = clone(ibiz.env);

package/src/de-logic/de-logic.ts

@@ -168,7 +168,11 @@ export class DELogic {
    * @param {IParams} [opt]
    * @return {*}  {Promise<IData>}
    */
-  async exec(context: IParams, data: IData, params: IParams): Promise<unknown> {
+  async exec(
+    context: IParams,
+    data: IData | IData[],
+    params: IParams,
+  ): Promise<unknown> {
     if (this.scriptFn) {
       return this.scriptFn.exec({ context, data, params });
     }

package/src/de-logic/index.ts

@@ -1,5 +1,7 @@
 import { HttpError, HttpResponse, RuntimeError } from '@ibiz-template/core';
 import { IAppDataEntity, IAppDELogic } from '@ibiz/model-core';
+import { isArray } from 'lodash-es';
+import { clone } from 'ramda';
 import { filterFieldLogics, findDELogic } from '../model';
 import { DELogic } from './de-logic';
 
@@ -42,12 +44,13 @@ async function findDeLogic(
 export async function execDELogic(
   deDELogic: IAppDELogic,
   context: IParams,
-  data: IData,
-  params: IParams,
+  data: IData | IData[] = {},
+  params: IParams = {},
 ): Promise<unknown> {
   if (!deLogicMap.has(deDELogic)) {
     deLogicMap.set(deDELogic, new DELogic(deDELogic));
   }
+
   const deLogic = deLogicMap.get(deDELogic)!;
   return deLogic.exec(context, data, params);
 }
@@ -97,11 +100,15 @@ export async function execDELogicById(
 export async function execDELogicAction(
   deDELogic: IAppDELogic,
   context: IParams,
-  data: IData,
-  params: IParams,
+  data?: IData | IData[],
+  params?: IParams,
 ): Promise<HttpResponse<IData>> {
+  const _context = clone(context);
+  const _data = data ? clone(data) : data;
+  const _params = params ? clone(params) : params;
+
   try {
-    const result = await execDELogic(deDELogic, context, data, params);
+    const result = await execDELogic(deDELogic, _context, _data, _params);
     return new HttpResponse(result);
   } catch (err) {
     if (err instanceof HttpError) {
@@ -112,9 +119,9 @@ export async function execDELogicAction(
 }
 
 /**
- * 执行属性实体逻辑
+ * 执行属性实体逻辑（单条数据）
  * @author lxm
- * @date 2023-06-14 12:29:56
+ * @date 2023-10-19 04:00:15
  * @export
  * @param {IAppDataEntity} entity
  * @param {('compute' | 'change' | 'default')} type
@@ -123,7 +130,7 @@ export async function execDELogicAction(
  * @param {IParams} params
  * @return {*}  {Promise<void>}
  */
-export async function execFieldLogics(
+async function execSingleFieldLogics(
   entity: IAppDataEntity,
   type: 'compute' | 'change' | 'default',
   context: IParams,
@@ -142,3 +149,37 @@ export async function execFieldLogics(
     });
   }
 }
+
+/**
+ * 执行属性实体逻辑(单条或者多条)
+ * @author lxm
+ * @date 2023-06-14 12:29:56
+ * @export
+ * @param {IAppDataEntity} entity
+ * @param {('compute' | 'change' | 'default')} type
+ * @param {IParams} context
+ * @param {IData | IData[]} data 单条或多条数据
+ * @param {IParams} params
+ * @return {*}  {Promise<void>}
+ */
+export async function execFieldLogics(
+  entity: IAppDataEntity,
+  type: 'compute' | 'change' | 'default',
+  context: IParams,
+  data: IData | IData[],
+  params: IParams = {},
+): Promise<void> {
+  if (!data) {
+    return;
+  }
+
+  if (isArray(data)) {
+    await Promise.all(
+      data.map(item =>
+        execSingleFieldLogics(entity, type, context, item, params),
+      ),
+    );
+    return;
+  }
+  return execSingleFieldLogics(entity, type, context, data, params);
+}

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

@@ -12,6 +12,7 @@ import {
   ISearchBarController,
   MDCtrlLoadParams,
   EventBase,
+  IUIActionResult,
 } from '../interface';
 import { calcDeCodeNameById } from '../model';
 import { ViewEngineBase } from './view-base.engine';
@@ -162,12 +163,10 @@ export class MDViewEngine extends ViewEngineBase {
       return null;
     }
     if (key === SysUIActionTag.EDIT || key === SysUIActionTag.VIEW) {
-      await this.openData(args!);
-      return null;
+      return this.openData(args!);
     }
     if (key === SysUIActionTag.NEW) {
-      await this.newData(args!);
-      return null;
+      return this.newData(args!);
     }
     if (key === SysUIActionTag.REMOVE) {
       await this.remove(args);
@@ -214,7 +213,7 @@ export class MDViewEngine extends ViewEngineBase {
     event?: MouseEvent;
     context?: IContext;
     params?: IParams;
-  }): Promise<void> {
+  }): Promise<IUIActionResult> {
     const { data, event } = args;
 
     // 添加选中数据的主键
@@ -233,10 +232,12 @@ export class MDViewEngine extends ViewEngineBase {
       view: this.view,
     });
 
-    if (result instanceof Object && result.ok) {
-      this.refresh();
-    } else if (result === -1) {
-      ibiz.log.warn(`视图[${this.view.model.codeName}]，未配置编辑打开视图`);
+    if (result === -1) {
+      throw new RuntimeModelError(this.view.model, `缺少newdata的视图逻辑`);
+    } else {
+      return {
+        cancel: !result.ok,
+      };
     }
   }
 
@@ -253,7 +254,7 @@ export class MDViewEngine extends ViewEngineBase {
     data: IData[];
     event?: MouseEvent;
     copyMode?: boolean;
-  }): Promise<void> {
+  }): Promise<IUIActionResult> {
     const { data, event, copyMode } = args;
     const openAppViewLogic =
       this.view.model.viewLayoutPanel?.appViewLogics?.find(
@@ -276,10 +277,12 @@ export class MDViewEngine extends ViewEngineBase {
       view: this.view,
     });
 
-    if (result instanceof Object && result.ok) {
-      this.refresh();
-    } else if (result === -1) {
+    if (result === -1) {
       throw new RuntimeModelError(this.view.model, `缺少newdata的视图逻辑`);
+    } else {
+      return {
+        cancel: !result.ok,
+      };
     }
   }