@ibiz-template/runtime 0.1.6 → 0.1.8

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

@@ -21,4 +21,18 @@ export interface ITreeEvent extends IMDControlEvent {
     event: EventBase & { nodeData: ITreeNodeData };
     emitArgs: { data: IData[]; nodeData: ITreeNodeData };
   };
+
+  /**
+   * 父节点刷新结束之后事件
+   * @author lxm
+   * @date 2023-08-18 02:18:24
+   * @type {({
+   *     event: EventBase & { children: ITreeNodeData[] };
+   *     emitArgs: { children: ITreeNodeData[] };
+   *   })}
+   */
+  onAfterRefreshParent: {
+    event: EventBase & { parentNode: ITreeNodeData; children: ITreeNodeData[] };
+    emitArgs: { parentNode: ITreeNodeData; children: ITreeNodeData[] };
+  };
 }

package/src/interface/controller/state/control/i-grid.state.ts

@@ -36,6 +36,14 @@ export interface IGridState extends IMDControlState {
    * @type {IData}
    */
   remoteAggResult?: IData;
+
+  /**
+   * 开启表格行编辑
+   * @author lxm
+   * @date 2023-08-17 02:38:18
+   * @type {boolean}
+   */
+  rowEditOpen: boolean;
 }
 
 export interface IGridRowState {
@@ -75,6 +83,7 @@ export interface IGridRowState {
   editColStates: {
     [p: string]: {
       disabled: boolean;
+      readonly: boolean;
       editable: boolean;
       required: boolean;
     };

package/src/interface/controller/state/control/i-tree.state.ts

@@ -1,4 +1,4 @@
-import { IButtonContainerState } from '../../common';
+import { IButtonContainerState, IIcon } from '../../common';
 import { IMDControlState } from './i-md-control.state';
 
 /**
@@ -10,6 +10,8 @@ import { IMDControlState } from './i-md-control.state';
  * @extends {IMDControlState}
  */
 export interface ITreeState extends IMDControlState {
+  items: ITreeNodeData[];
+
   /**
    * 树的根节点
    *
@@ -152,5 +154,21 @@ export interface ITreeNodeData {
    */
   srfmajortext?: string;
 
+  /**
+   * 图标
+   * @author lxm
+   * @date 2023-08-15 02:02:49
+   * @type {IIcon}
+   */
+  icon?: IIcon;
+
+  /**
+   * 节点文本的html显示
+   * @author lxm
+   * @date 2023-08-15 02:15:09
+   * @type {string}
+   */
+  textHtml?: string;
+
   // todo 其他界面绘制相关属性
 }

package/src/interface/controller/work-flow/wf-link.ts

@@ -64,4 +64,14 @@ export interface WFLink {
    * @type {string}
    */
   type?: 'reassign' | 'addstepbefore' | 'sendback' | 'sendcopy' | string;
+
+  /**
+   * link按钮标识
+   *
+   * @author zk
+   * @date 2023-08-17 12:08:32
+   * @type {string}
+   * @memberof WFLink
+   */
+  id: string;
 }

package/src/interface/logic-scheduler/i-scheduler-logic.ts

@@ -88,21 +88,24 @@ export interface ISchedulerLogic {
   /**
    * 事件名称
    * @type {string}
-   * 来源  getEventNames
    */
   eventNames?: string;
 
   /**
    * 事件参数
    * @type {string}
-   * 来源  getEventArg
    */
   eventArg?: string;
 
   /**
    * 事件参数2
    * @type {string}
-   * 来源  getEventArg2
    */
   eventArg2?: string;
+
+  /**
+   * 部件名称
+   * @type {string}
+   */
+  ctrlName?: string;
 }

package/src/interface/logic-scheduler/i-trigger-match-params.ts

@@ -22,4 +22,10 @@ export interface ITriggerMatchParams {
    * 来源  getEventNames
    */
   eventName?: string;
+
+  /**
+   * 部件名称
+   * @type {string}
+   */
+  ctrlName?: string;
 }

package/src/interface/service/service/i-auth.service.ts

@@ -0,0 +1,29 @@
+/**
+ * 认证服务
+ *
+ * @author chitanda
+ * @date 2023-08-17 16:08:08
+ * @export
+ * @interface IAuthService
+ */
+export interface IAuthService {
+  /**
+   * 登录
+   *
+   * @author chitanda
+   * @date 2023-08-17 16:08:23
+   * @param {string} loginName
+   * @param {string} password
+   * @return {*}  {Promise<boolean>}
+   */
+  login(loginName: string, password: string): Promise<boolean>;
+
+  /**
+   * 登出
+   *
+   * @author chitanda
+   * @date 2023-08-17 16:08:33
+   * @return {*}  {Promise<boolean>}
+   */
+  logout(): Promise<boolean>;
+}

package/src/interface/service/service/index.ts

@@ -1,4 +1,5 @@
-export * from './i-app-de-authority.service';
-export * from './i-app-de.service';
-export * from './i-file.service';
-export * from './i-wf.service';
+export type { IAppDeAuthorityService } from './i-app-de-authority.service';
+export type { IAppDEService } from './i-app-de.service';
+export type { IAuthService } from './i-auth.service';
+export type { IFileService } from './i-file.service';
+export type { IWorkFlowService } from './i-wf.service';

package/src/interface/util/i-confirm-util/i-confirm-util.ts

@@ -0,0 +1,82 @@
+/**
+ * 确认框参数
+ *
+ * @author chitanda
+ * @date 2022-08-17 16:08:42
+ * @export
+ * @interface ConfirmParams
+ */
+export interface ConfirmParams {
+  /**
+   * 标题
+   *
+   * @author chitanda
+   * @date 2022-08-17 16:08:04
+   * @type {string}
+   */
+  title: string;
+  /**
+   * 描述
+   *
+   * @author chitanda
+   * @date 2022-08-17 16:08:08
+   * @type {string}
+   */
+  desc?: string;
+  /**
+   * 传递给组件的参数
+   *
+   * @author chitanda
+   * @date 2023-08-14 15:08:07
+   * @type {IParams}
+   */
+  options?: IParams;
+}
+
+/**
+ * 确认框
+ *
+ * @description 需要用户确认收到提示消息时使用此工具
+ * @author chitanda
+ * @date 2022-08-17 16:08:25
+ * @export
+ * @interface IConfirmUtil
+ */
+export interface IConfirmUtil {
+  /**
+   * 普通信息
+   *
+   * @author chitanda
+   * @date 2022-08-17 16:08:36
+   * @param {ConfirmParams} params
+   * @return {*}  {Promise<boolean>}
+   */
+  info(params: ConfirmParams): Promise<boolean>;
+  /**
+   * 成功信息
+   *
+   * @author chitanda
+   * @date 2022-08-17 16:08:47
+   * @param {ConfirmParams} params
+   * @return {*}  {Promise<boolean>}
+   */
+  success(params: ConfirmParams): Promise<boolean>;
+  /**
+   * 警告信息
+   *
+   * @author chitanda
+   * @date 2022-08-17 16:08:53
+   * @param {ConfirmParams} params
+   * @return {*}  {Promise<boolean>}
+   */
+  warning(params: ConfirmParams): Promise<boolean>;
+  /**
+   * 错误信息
+   *
+   * @author chitanda
+   * @date 2022-08-17 16:08:59
+   * @param {ConfirmParams} params
+   * @return {*}  {Promise<boolean>}
+   */
+  error(params: ConfirmParams): Promise<boolean>;
+}

package/src/interface/util/i-modal-util/i-modal-util.ts

@@ -23,6 +23,14 @@ export interface ModalParams {
    * @type {string}
    */
   desc?: string;
+  /**
+   * 传递给时机组件的参数
+   *
+   * @author chitanda
+   * @date 2023-08-14 15:08:07
+   * @type {IParams}
+   */
+  options?: IParams;
 }
 
 /**

package/src/interface/util/i-open-view-util/i-open-view-util.ts

@@ -10,6 +10,16 @@ import { IModalData, IViewConfig } from '../../common';
  * @interface IOpenViewUtil
  */
 export interface IOpenViewUtil {
+  /**
+   * 直接路径打开视图
+   *
+   * @author chitanda
+   * @date 2023-08-18 11:08:33
+   * @param {string} path
+   * @return {*}  {Promise<IModalData>}
+   */
+  push(path: string): Promise<IModalData>;
+
   /**
    * 打开顶级视图(一般为路由打开)
    *

package/src/interface/util/index.ts

@@ -1,6 +1,7 @@
 export { ILoadingUtil } from './i-loading-util/i-loading-util';
 export { IMessageUtil } from './i-message-util/i-message-util';
 export { IModalUtil, ModalParams } from './i-modal-util/i-modal-util';
+export { IConfirmUtil, ConfirmParams } from './i-confirm-util/i-confirm-util';
 export {
   INotificationUtil,
   NotificationParams,

package/src/logic-scheduler/index.ts

@@ -12,6 +12,7 @@ import { LogicTriggerFactory } from './trigger/logic-trigger-factory';
 import { TimerTrigger } from './trigger/timer-trigger';
 import { AppUILogicExecutor } from './executor/app-ui-logic-executor';
 import { ViewEventTrigger } from './trigger/view-event-trigger';
+import { ControlEventTrigger } from './trigger/control-event-trigger';
 
 export {
   LogicSchedulerCenter,
@@ -54,6 +55,10 @@ export function installLogicSchedule(): void {
     'VIEWEVENT',
     (logic, scheduler) => new ViewEventTrigger(logic, scheduler),
   );
+  ibiz.scheduler.triggerFactory.register(
+    'CTRLEVENT',
+    (logic, scheduler) => new ControlEventTrigger(logic, scheduler),
+  );
 
   // 执行器
   ibiz.scheduler.executorFactory.register(

package/src/logic-scheduler/scheduler/logic-scheduler.ts

@@ -3,6 +3,7 @@ import type {
   IUILogicParams,
   ISchedulerLogic,
   ITriggerMatchParams,
+  EventBase,
 } from '../../interface';
 import { LogicExecutor } from '../executor/logic-executor';
 import { LogicTrigger } from '../trigger/logic-trigger';
@@ -22,6 +23,22 @@ export class LogicScheduler {
 
   executors = new Map<string, LogicExecutor>();
 
+  /**
+   * 是否有视图事件触发类型逻辑
+   * @author lxm
+   * @date 2023-08-14 02:19:51
+   * @type {boolean}
+   */
+  hasViewEventTrigger: boolean = false;
+
+  /**
+   * 是否有部件事件触发类型逻辑
+   * @author lxm
+   * @date 2023-08-14 02:19:51
+   * @type {boolean}
+   */
+  hasControlEventTrigger: boolean = false;
+
   constructor(logics: ISchedulerLogic[]) {
     this.logics = logics;
     logics.forEach(logic => {
@@ -78,6 +95,15 @@ export class LogicScheduler {
    * @return {*}  {LogicTrigger}
    */
   protected createTrigger(logic: ISchedulerLogic): LogicTrigger {
+    switch (logic.triggerType) {
+      case 'VIEWEVENT':
+        this.hasViewEventTrigger = true;
+        break;
+      case 'CTRLEVENT':
+        this.hasControlEventTrigger = true;
+        break;
+      default:
+    }
     return ibiz.scheduler.triggerFactory.createTrigger(logic, this);
   }
 
@@ -228,4 +254,21 @@ export class LogicScheduler {
     const params = this.getExecuteParams(executeParams);
     return trigger.execute(params);
   }
+
+  /**
+   * 触发部件事件
+   * @author lxm
+   * @date 2023-06-26 02:26:33
+   * @param {string} itemName 子项名称
+   * @param {Partial<IUILogicParams>} executeParams 执行参数
+   * @return {*}  {(boolean | undefined)}
+   */
+  triggerControlEvent(ctrlName: string, event: EventBase): void {
+    const matchParams = {
+      ctrlName,
+      eventName: event.eventName,
+      triggerType: 'CTRLEVENT',
+    } as const;
+    this.triggerAndExecute(matchParams, event);
+  }
 }

package/src/logic-scheduler/trigger/control-event-trigger.ts

@@ -0,0 +1,45 @@
+import { StudioControlEvents } from '../../constant';
+import type { ISchedulerLogic, ITriggerMatchParams } from '../../interface';
+import { LogicScheduler } from '../scheduler/logic-scheduler';
+import { LogicTrigger } from './logic-trigger';
+
+/**
+ * 部件事件触发器
+ * @author lxm
+ * @date 2023-08-14 02:10:46
+ * @export
+ * @class ControlEventTrigger
+ * @extends {LogicTrigger}
+ */
+export class ControlEventTrigger extends LogicTrigger {
+  declare type: 'CTRLEVENT';
+
+  /**
+   * 监听事件名称集合
+   * @author lxm
+   * @date 2023-07-26 05:48:30
+   * @protected
+   * @type {string[]}
+   */
+  protected listenEventNames: string[] = [];
+
+  constructor(
+    protected logic: ISchedulerLogic,
+    protected scheduler: LogicScheduler,
+  ) {
+    super(logic, scheduler);
+    const names = logic.eventNames!.split(',');
+    this.listenEventNames = names.map(
+      name => StudioControlEvents[name as keyof StudioControlEvents] || name,
+    );
+  }
+
+  match(matchParams: ITriggerMatchParams): boolean {
+    const superResult = super.match(matchParams);
+    return (
+      superResult &&
+      matchParams.ctrlName === this.logic.ctrlName &&
+      this.listenEventNames.includes(matchParams.eventName!)
+    );
+  }
+}

package/src/logic-scheduler/trigger/view-event-trigger.ts

@@ -3,6 +3,14 @@ import type { ISchedulerLogic, ITriggerMatchParams } from '../../interface';
 import { LogicScheduler } from '../scheduler/logic-scheduler';
 import { LogicTrigger } from './logic-trigger';
 
+/**
+ * 视图事件触发器
+ * @author lxm
+ * @date 2023-08-14 02:12:44
+ * @export
+ * @class ViewEventTrigger
+ * @extends {LogicTrigger}
+ */
 export class ViewEventTrigger extends LogicTrigger {
   declare type: 'VIEWEVENT';
 

package/src/register/helper/editor-register.ts

@@ -37,7 +37,8 @@ export async function getEditorProvider(
   model: IEditor,
 ): Promise<IEditorProvider | undefined> {
   let provider: IEditorProvider | undefined;
-  const { editorType, editorStyle } = model as Required<IEditor>;
+  const { editorType, editorStyle, predefinedType } =
+    model as Required<IEditor>;
 
   // 再找编辑器类型和编辑器样式
   if (editorStyle && editorStyle !== 'DEFAULT') {
@@ -51,6 +52,21 @@ export async function getEditorProvider(
     }
   }
 
+  // 编辑器预置类型
+  if (predefinedType) {
+    let key = `${predefinedType}_${editorType}`;
+    if (editorStyle && editorStyle !== 'DEFAULT') {
+      key += `_${editorStyle}`;
+    }
+    provider = getProvider(key);
+    if (!provider) {
+      ibiz.log.error(
+        `找不到编辑器类型：[${editorType}]的预置类型：[${predefinedType}]对应的适配器`,
+        model,
+      );
+    }
+  }
+
   // 找编辑器类型
   if (!provider) {
     provider = getProvider(editorType);

package/src/service/dto/method.dto.ts

@@ -1,11 +1,9 @@
 /* eslint-disable no-await-in-loop */
-import { clone } from 'ramda';
 import {
   IAppDataEntity,
   IAppDEMethodDTO,
   IAppDEMethodDTOField,
 } from '@ibiz/model-core';
-import { isNilOrEmpty } from 'qx-util';
 import { ModelError } from '@ibiz-template/core';
 import { Application } from '../../application';
 import { AppDataEntity } from '../app-data-entity/app-data-entity';
@@ -54,23 +52,18 @@ export class MethodDto {
   async get(context: IParams, data: IData): Promise<IData> {
     const params: IData = {};
     // 拷贝数据
-    const copyData = clone(data);
     for (let i = 0; i < this.fields.length; i++) {
       const field = this.fields[i];
       const key = field.codeName!.toLowerCase();
       switch (field.type) {
         case 'SIMPLE': {
-          const val = copyData[key];
-          if (isNilOrEmpty(val)) {
-            params[key] = null;
-          } else {
-            params[key] = val;
-          }
-          // 取值后删除
-          delete copyData[key];
           break;
         }
         case 'DTOS': {
+          // 没有实体id的不处理
+          if (!field.refAppDataEntityId) {
+            break;
+          }
           const dto = await this.getFieldDto(field);
           const service = await this.app!.deService.getService(
             field.refAppDataEntityId!,
@@ -93,8 +86,7 @@ export class MethodDto {
       }
     }
     // 合并剩余参数
-    Object.assign(params, copyData);
-    return params;
+    return { ...data, ...params };
   }
 
   /**
@@ -114,6 +106,10 @@ export class MethodDto {
         const all = this.fields
           .filter(field => field.type === 'DTOS')
           .map(async field => {
+            // 没有实体id的不处理
+            if (!field.refAppDataEntityId) {
+              return;
+            }
             const key = field.codeName!.toLowerCase();
             const dto = await this.getFieldDto(field);
             const items: IData[] = datum[key];

package/src/service/service/auth/v7-auth.service.ts

@@ -0,0 +1,49 @@
+import { CoreConst, HttpError } from '@ibiz-template/core';
+import { clearCookie, setCookie } from 'qx-util';
+import { IAuthService } from '../../../interface';
+
+/**
+ * 认证服务
+ *
+ * @author chitanda
+ * @date 2022-07-19 18:07:51
+ * @export
+ * @class AuthService
+ */
+export class V7AuthService implements IAuthService {
+  async login(loginname: string, password: string): Promise<boolean> {
+    // eslint-disable-next-line no-useless-catch
+    try {
+      const res = await ibiz.net.post('/v7/login', { loginname, password });
+      const { data } = res;
+      if (data && data.token) {
+        setCookie(CoreConst.TOKEN, data.token, 0, true);
+        const expiredDate =
+          new Date().getTime() + (data.expirein || 7199) * 1000;
+        setCookie(CoreConst.TOKEN_EXPIRES, `${expiredDate}`, 0, true);
+      }
+      return true;
+    } catch (err: unknown) {
+      ibiz.notification.error({
+        title: '登录失败',
+        desc: (err as HttpError).message || '',
+      });
+    }
+    return false;
+  }
+
+  async logout(): Promise<boolean> {
+    try {
+      await ibiz.net.get('/v7/logout');
+      clearCookie(CoreConst.TOKEN);
+      clearCookie(CoreConst.TOKEN_EXPIRES);
+      return true;
+    } catch (err: unknown) {
+      ibiz.notification.error({
+        title: '登出失败',
+        desc: (err as HttpError).message || '',
+      });
+    }
+    return false;
+  }
+}

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

@@ -99,8 +99,15 @@ export class CodeListService {
   ): Readonly<CodeListItem>[] {
     return codeItems.map(codeItem => {
       // todo代码项其他属性，表单数据
+      let text = codeItem.text!;
+      if (codeItem.textLanguageRes) {
+        text = ibiz.i18n.t(
+          codeItem.textLanguageRes.lanResTag!,
+          codeItem.textLanguageRes.defaultContent,
+        );
+      }
       const _codeItem: CodeListItem = {
-        text: codeItem.text!,
+        text,
         value: isValueNumber ? Number(codeItem.value) : codeItem.value!,
         color: codeItem.color,
         id: codeItem.codeName!,

package/src/service/service/index.ts

@@ -4,4 +4,4 @@ export { DEService } from './entity/de.service';
 export { WorkFlowService } from './work-flow/work-flow.service';
 export * from './control';
 export * from './authority';
-export { AuthService } from './auth/auth.service';
+export { V7AuthService } from './auth/v7-auth.service';

package/src/service/vo/control.vo.ts

@@ -1,4 +1,4 @@
-import { isNil } from 'ramda';
+import { clone, isNil } from 'ramda';
 import { Srfuf } from '../constant';
 import { UIMapField } from './ui-map-field';
 
@@ -220,4 +220,20 @@ export class ControlVO {
   setOrigin(data: IData | ControlVO): void {
     this.$origin = data instanceof ControlVO ? data.getOrigin() : data;
   }
+
+  /**
+   * 克隆新的vo数据
+   *
+   * @author lxm
+   * @date 2023-08-16 11:08:29
+   * @return {*}  {ControlVO}
+   */
+  clone(): ControlVO {
+    const cloneOrigin = clone(this.$origin);
+    const newVal = new ControlVO(cloneOrigin, this.$dataUIMap);
+    Object.keys(this).forEach(key => {
+      newVal[key] = this[key];
+    });
+    return newVal;
+  }
 }

package/src/service/vo/tree-node-data/tree-code-list-node-data.ts

@@ -54,5 +54,7 @@ export class TreeCodeListNodeData
 
     this.srfkey = this.value;
     this.srfmajortext = this.text;
+
+    this.icon = this.calcIcon(model);
   }
 }