@ibiz-template/runtime 0.1.7 → 0.1.8

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

@@ -142,11 +142,11 @@ export class MDViewEngine extends ViewEngineBase {
       return null;
     }
     if (key === SysUIActionTag.EDIT || key === SysUIActionTag.VIEW) {
-      this.openData(args!);
+      await this.openData(args!);
       return null;
     }
     if (key === SysUIActionTag.NEW) {
-      this.newData(args!);
+      await this.newData(args!);
       return null;
     }
     if (key === SysUIActionTag.REMOVE) {
@@ -300,10 +300,19 @@ export class MDViewEngine extends ViewEngineBase {
     // 有搜索表单的整合相关参数
     if (this.searchForm) {
       const addParams = this.searchForm.getData()[0];
-      Object.assign(params, addParams);
+      const filteredParams = Object.entries(addParams).reduce(
+        (result: IData, [key, value]) => {
+          if (value !== null && value !== undefined && value !== '') {
+            result[key] = value;
+          }
+          return result;
+        },
+        {},
+      );
+      Object.assign(params, filteredParams);
     }
     // 有搜索栏的整合相关参数
-    if (this.searchBar) {
+    if (this.searchBar && this.searchBar.state.query) {
       const addParams = {
         query: this.searchBar.state.query,
       };

package/src/install.ts

@@ -1,7 +1,7 @@
 import { GlobalConfig } from './config/global-config';
 import { RegisterCenter } from './register/register-center';
 import { installCommand } from './command';
-import { AuthService } from './service';
+import { V7AuthService } from './service';
 import { AppHub } from './app-hub';
 import { EngineFactory } from './engine';
 import { GlobalUtil } from './global';
@@ -26,7 +26,7 @@ export function install(): void {
   // 初始化全局配置
   ibiz.config = new GlobalConfig();
   // 挂载认证服务
-  ibiz.auth = new AuthService();
+  ibiz.auth = new V7AuthService();
   // 挂载引擎工厂
   ibiz.engine = new EngineFactory();
   // 安装默认指令

package/src/interface/controller/common/i-icon/i-icon.ts

@@ -21,4 +21,12 @@ export interface IIcon {
    * @type {string}
    */
   imagePath?: string;
+
+  /**
+   * html字符串
+   * @author lxm
+   * @date 2023-08-15 02:14:26
+   * @type {string}
+   */
+  htmlStr?: string;
 }

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

@@ -24,7 +24,7 @@ export interface IGridController
   newRow(): Promise<void>;
 
   /**
-   * 保存
+   * 保存单条数据
    *
    * @author zk
    * @date 2023-07-31 02:07:52
@@ -33,13 +33,21 @@ export interface IGridController
   save(data: ControlVO): Promise<void>;
 
   /**
-   * 切换行编辑状态
+   * 保存表格所有数据
    *
    * @author zk
-   * @date 2023-07-31 02:07:26
+   * @date 2023-07-31 02:07:52
    * @memberof IGridController
    */
-  toggleRowEdit(row?: IData): void;
+  saveAll(): Promise<void>;
+
+  /**
+   * 切换表格的行编辑开启关闭状态
+   * @author lxm
+   * @date 2023-08-16 10:18:14
+   * @param {IData} [rowData] 行数据
+   */
+  toggleRowEdit(): void;
 
   /**
    * 数据导出

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

@@ -20,7 +20,15 @@ export interface MDCtrlLoadParams extends IDataAbilityParams {
   isLoadMore?: boolean;
 }
 
-export interface MDCtrlRemoveParams extends IDataAbilityParams {}
+export interface MDCtrlRemoveParams extends IDataAbilityParams {
+  /**
+   * 是否静默删除
+   * @author lxm
+   * @date 2023-08-17 06:04:23
+   * @type {boolean}
+   */
+  silent?: boolean;
+}
 
 /**
  * 多数据部件控制器

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

@@ -44,4 +44,12 @@ export interface ITreeController
     nodeData: ITreeNodeData,
     event: MouseEvent,
   ): Promise<void>;
+
+  /**
+   * 刷新父节点数据
+   * @author lxm
+   * @date 2023-08-18 01:49:59
+   * @param {ITreeNodeData} parentNode
+   */
+  refreshParent(parentData: ITreeNodeData | IData): void;
 }

package/src/interface/controller/event/argument/index.ts

@@ -6,3 +6,4 @@ export { CloseViewEvent } from './close-view.event';
 export { UIActionEvent } from './uiaction.event';
 export { ControlTriggerEvent } from './control-trigger.event';
 export { NavViewChangeEvent } from './nav-view-change.event';
+export { RowEditChangeEvent } from './row-edit-change.event';

package/src/interface/controller/event/argument/row-edit-change.event.ts

@@ -0,0 +1,20 @@
+import { IGridRowState } from '../../state';
+import { EventBase } from './base.event';
+
+/**
+ * 行编辑切换事件
+ * @author lxm
+ * @date 2023-03-26 02:07:11
+ * @export
+ * @interface RowEditChangeEvent
+ * @extends {EventBase}
+ */
+export interface RowEditChangeEvent extends EventBase {
+  /**
+   * 行状态对象
+   * @author lxm
+   * @date 2023-08-17 06:58:15
+   * @type {IGridRowState}
+   */
+  row: IGridRowState;
+}

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

@@ -1,4 +1,5 @@
-import { EventBase } from '../..';
+import { PartialWithObject } from '@ibiz-template/core';
+import { EventBase, RowEditChangeEvent } from '../..';
 import { IMDControlEvent } from './i-md-control.event';
 
 /**
@@ -21,4 +22,16 @@ export interface IGridEvent extends IMDControlEvent {
     event: EventBase;
     emitArgs: { data: IData[] };
   };
+
+  /**
+   * 表格行编辑切换事件
+   * @author lxm
+   * @date 2023-03-26 06:15:06
+   * @param {emitArgs} undefined
+   * @return {*}  {Promise<void>}
+   */
+  onRowEditChange: {
+    event: RowEditChangeEvent;
+    emitArgs: PartialWithObject<RowEditChangeEvent, EventBase>;
+  };
 }

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/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-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/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

@@ -60,6 +60,10 @@ export class MethodDto {
           break;
         }
         case 'DTOS': {
+          // 没有实体id的不处理
+          if (!field.refAppDataEntityId) {
+            break;
+          }
           const dto = await this.getFieldDto(field);
           const service = await this.app!.deService.getService(
             field.refAppDataEntityId!,
@@ -102,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/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);
   }
 }

package/src/service/vo/tree-node-data/tree-data-set-node-data.ts

@@ -1,6 +1,7 @@
-import { IDETreeDataSetNode } from '@ibiz/model-core';
-import { ITreeNodeData } from '../../../interface';
+import { IDETreeDataSetNode, IDETreeNodeDataItem } from '@ibiz/model-core';
+import { IIcon, ITreeNodeData } from '../../../interface';
 import { calcDeCodeNameById } from '../../../model';
+import { ScriptFactory } from '../../../utils';
 import { TreeNodeData } from './tree-node-data';
 
 /**
@@ -51,5 +52,62 @@ export class TreeDataSetNodeData extends TreeNodeData implements ITreeNodeData {
 
     this.srfkey = this.deData.srfkey;
     this.srfmajortext = this.deData.srfmajortext;
+
+    this.icon = this.calcIcon(model);
+    this.textHtml = this.calcTextHtml(model);
+  }
+
+  protected calcIcon(model: IDETreeDataSetNode): IIcon | undefined {
+    const icon = super.calcIcon(model) || {};
+    const { iconAppDEFieldId, detreeNodeDataItems } = model;
+    if (iconAppDEFieldId && this.deData[iconAppDEFieldId]) {
+      icon.imagePath = this.deData[iconAppDEFieldId];
+    }
+
+    if (icon) {
+      this.icon = icon;
+    }
+    const iconDataItem = detreeNodeDataItems?.find(item => item.id === 'icon');
+    if (iconDataItem) {
+      icon.htmlStr = this.calcDataItemScript(iconDataItem);
+    }
+    return Object.values(icon).length > 0 ? icon : undefined;
+  }
+
+  /**
+   * 计算节点数据项的自定义脚本内容
+   * @author lxm
+   * @date 2023-08-15 02:37:29
+   * @protected
+   * @param {IDETreeNodeDataItem} dataItem
+   * @return {*}  {(string | undefined)}
+   */
+  protected calcDataItemScript(
+    dataItem: IDETreeNodeDataItem,
+  ): string | undefined {
+    if (dataItem.customCode && dataItem.scriptCode) {
+      return ScriptFactory.execScriptFn(
+        { data: this.deData },
+        dataItem.scriptCode,
+      ) as string;
+    }
+  }
+
+  /**
+   * 计算节点文本html内容
+   * @author lxm
+   * @date 2023-08-15 02:41:31
+   * @protected
+   * @param {IDETreeDataSetNode} model
+   * @return {*}  {(string | undefined)}
+   */
+  protected calcTextHtml(model: IDETreeDataSetNode): string | undefined {
+    let html: string | undefined;
+    const { detreeNodeDataItems } = model;
+    const textDataItem = detreeNodeDataItems?.find(item => item.id === 'text');
+    if (textDataItem) {
+      html = this.calcDataItemScript(textDataItem);
+    }
+    return html;
   }
 }

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

@@ -1,5 +1,5 @@
 import { IDETreeNode } from '@ibiz/model-core';
-import { ITreeNodeData } from '../../../interface';
+import { IIcon, ITreeNodeData } from '../../../interface';
 
 /**
  * 树节点数据基类
@@ -33,6 +33,10 @@ export abstract class TreeNodeData implements ITreeNodeData {
 
   parent?: ITreeNodeData;
 
+  icon?: IIcon;
+
+  textHtml?: string;
+
   constructor(
     model: IDETreeNode,
     parentNodeData: ITreeNodeData | undefined,
@@ -56,7 +60,27 @@ export abstract class TreeNodeData implements ITreeNodeData {
     }
 
     this.nodeId = model.id!;
-    // todo 是否有自己点跟是否搜索有关
-    // this.leaf = model.tree.getChildNodes(model.id, opts.hasQuery).length === 0;
+  }
+
+  /**
+   * 计算节点图标
+   * @author lxm
+   * @date 2023-08-15 02:24:55
+   * @protected
+   * @param {IDETreeNode} model
+   * @return {*}  {(IIcon | undefined)}
+   */
+  protected calcIcon(model: IDETreeNode): IIcon | undefined {
+    const { sysImage } = model;
+    const icon: IIcon = {};
+    if (sysImage) {
+      if (sysImage.cssClass) {
+        icon.cssClass = sysImage.cssClass;
+      }
+      if (sysImage.imagePath) {
+        icon.imagePath = sysImage.imagePath;
+      }
+    }
+    return Object.values(icon).length > 0 ? icon : undefined;
   }
 }

package/src/service/vo/tree-node-data/tree-static-node-data.ts

@@ -50,5 +50,7 @@ export class TreeStaticNodeData extends TreeNodeData implements ITreeNodeData {
 
     this.srfkey = this.deData?.srfkey || this.value;
     this.srfmajortext = this.deData?.srfmajortext || this.text;
+
+    this.icon = this.calcIcon(model);
   }
 }

package/src/types.ts

@@ -12,10 +12,10 @@ import {
   IOverlayController,
   IGlobalConfig,
   IAppHubService,
+  IAuthService,
 } from './interface';
 import { LogicSchedulerCenter } from './logic-scheduler';
 import { RegisterCenter } from './register/register-center';
-import { AuthService } from './service';
 
 declare module '@ibiz-template/core' {
   interface IBizSys {
@@ -128,9 +128,9 @@ declare module '@ibiz-template/core' {
      *
      * @author chitanda
      * @date 2022-07-20 10:07:33
-     * @type {AuthService}
+     * @type {IAuthService}
      */
-    auth: AuthService;
+    auth: IAuthService;
 
     /**
      * 引擎工厂

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

@@ -93,7 +93,7 @@ export class FrontUIActionProvider extends UIActionProviderBase {
       const result = ScriptFactory.execScriptFn(
         { context, params, data, el: event?.target },
         scriptCode,
-      );
+      ) as IUIActionResult | undefined;
       return result || {};
     }
     throw new RuntimeModelError(action, '自定义类型缺少配置脚本代码');