@ibiz-template/runtime 0.1.7 → 0.1.9

package/src/interface/controller/state/view/i-pickup-md-view.state.ts

@@ -0,0 +1,22 @@
+import { IMDViewState } from './i-md-view.state';
+
+/**
+ * 选择多数据视图UI状态
+ *
+ * @author zk
+ * @date 2023-05-25 05:05:43
+ * @export
+ * @interface IPickupMDViewState
+ * @extends {IMDViewState}
+ */
+export interface IPickupMDViewState extends IMDViewState {
+  /**
+   * 是否单选
+   *
+   * @author zk
+   * @date 2023-08-21 05:08:36
+   * @type {boolean}
+   * @memberof IPickupMDViewState
+   */
+  singleSelect: boolean;
+}

package/src/interface/controller/state/view/index.ts

@@ -35,3 +35,4 @@ export * from './i-de-portal-view.state';
 export * from './i-panel-view.state';
 export * from './i-calendar-view.state';
 export * from './i-calendar-exp-view.state';
+export * from './i-pickup-md-view.state';

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

@@ -1,4 +1,4 @@
-import { IModalData, IViewConfig } from '../../common';
+import { IModalData } from '../../common';
 
 /**
  * 打开视图工具类
@@ -10,18 +10,28 @@ 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>;
+
   /**
    * 打开顶级视图(一般为路由打开)
    *
    * @author chitanda
    * @date 2023-07-12 21:07:51
-   * @param {IViewConfig} appView
+   * @param {string} appViewId
    * @param {IContext} context
    * @param {IParams} [params]
    * @return {*}  {Promise<IModalData>}
    */
   root(
-    appView: IViewConfig,
+    appViewId: string,
     context: IContext,
     params?: IParams,
   ): Promise<IModalData>;
@@ -31,13 +41,13 @@ export interface IOpenViewUtil {
    *
    * @author chitanda
    * @date 2022-08-16 20:08:41
-   * @param {IViewConfig} appView
+   * @param {string} appViewId
    * @param {IContext} [context]
    * @param {IParams} [params]
    * @return {*}  {Promise<IModalData>}
    */
   modal(
-    appView: IViewConfig,
+    appViewId: string,
     context: IContext,
     params?: IParams,
   ): Promise<IModalData>;
@@ -47,13 +57,13 @@ export interface IOpenViewUtil {
    *
    * @author chitanda
    * @date 2022-08-16 20:08:22
-   * @param {IViewConfig} appView
+   * @param {string} appViewId
    * @param {IContext} [context]
    * @param {IParams} [params]
    * @return {*}  {Promise<IModalData>}
    */
   popover(
-    appView: IViewConfig,
+    appViewId: string,
     event: MouseEvent,
     context: IContext,
     params?: IParams,
@@ -64,13 +74,13 @@ export interface IOpenViewUtil {
    *
    * @author chitanda
    * @date 2022-08-16 20:08:46
-   * @param {IViewConfig} appView
+   * @param {string} appViewId
    * @param {IContext} [context]
    * @param {IParams} [params]
    * @return {*}  {Promise<IModalData>}
    */
   drawer(
-    appView: IViewConfig,
+    appViewId: string,
     context: IContext,
     params?: IParams,
   ): Promise<IModalData>;
@@ -80,13 +90,13 @@ export interface IOpenViewUtil {
    *
    * @author chitanda
    * @date 2022-08-16 20:08:29
-   * @param {IViewConfig} appView
+   * @param {string} appViewId
    * @param {IContext} [context]
    * @param {IParams} [params]
    * @return {*}  {Promise<IModalData>}
    */
   custom(
-    appView: IViewConfig,
+    appViewId: string,
     context: IContext,
     params?: IParams,
   ): Promise<IModalData>;

package/src/interface/util/script/i-script-function.ts

@@ -12,7 +12,7 @@ export interface IScriptFunctionOpts {
    * @date 2023-07-25 10:46:18
    * @type {boolean}
    */
-  singleRowReturn: boolean;
+  singleRowReturn?: boolean;
 
   /**
    * 预置参数
@@ -21,4 +21,12 @@ export interface IScriptFunctionOpts {
    * @type {IParams}
    */
   presetParams?: IParams;
+
+  /**
+   * 是否是异步函数脚本
+   * @author lxm
+   * @date 2023-08-21 03:15:43
+   * @type {boolean}
+   */
+  isAsync?: boolean;
 }

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

@@ -1,5 +1,4 @@
-import { RuntimeError } from '@ibiz-template/core';
-import { IUILogicParams } from '../../interface';
+import { IScriptFunctionOpts, IUILogicParams } from '../../interface';
 import { ScriptFactory, ScriptFunction } from '../../utils';
 import { LogicExecutor } from './logic-executor';
 
@@ -18,12 +17,12 @@ export class ScriptExecutor extends LogicExecutor {
   scriptFn?: ScriptFunction;
 
   /**
-   * 是否单行返回，脚本只是单行的且默认把值返回
+   * 初始化完成
    * @author lxm
-   * @date 2023-06-25 10:06:32
+   * @date 2023-08-21 04:27:38
    * @type {boolean}
    */
-  isRowReturn: boolean = false;
+  initialized: boolean = false;
 
   /**
    * 执行参数转换成脚本执行作用域参数
@@ -32,8 +31,9 @@ export class ScriptExecutor extends LogicExecutor {
    * @param {IUILogicParams} _executeParams
    * @return {*}  {IData[]}
    */
-  convertScriptArgs(_executeParams: IUILogicParams): IData {
-    throw new RuntimeError('未设置脚本执行参数转换方法');
+  convertScriptArgs(executeParams: IUILogicParams): IData {
+    // 默认不特殊处理的不转换
+    return executeParams;
   }
 
   /**
@@ -46,16 +46,13 @@ export class ScriptExecutor extends LogicExecutor {
   init(
     paramKeys: string[],
     convertFun: (executeParams: IUILogicParams) => IData,
+    options?: IScriptFunctionOpts,
   ): void {
     this.convertScriptArgs = convertFun;
-    let code = this.logic.scriptCode!;
-    if (this.isRowReturn) {
-      code = `return (${code})`;
-    }
+    const code = this.logic.scriptCode!;
     // eslint-disable-next-line no-new-func
-    this.scriptFn = ScriptFactory.createScriptFn(paramKeys, code, {
-      singleRowReturn: this.isRowReturn,
-    });
+    this.scriptFn = ScriptFactory.createScriptFn(paramKeys, code, options);
+    this.initialized = true;
   }
 
   // eslint-disable-next-line @typescript-eslint/no-explicit-any

package/src/logic-scheduler/trigger/item-dyna-logic-trigger.ts

@@ -16,8 +16,10 @@ export class ItemDynaLogicTrigger extends LogicTrigger {
         `预定义逻辑类型${this.type}的触发器类型只能是脚本`,
       );
     }
-    this.executor.isRowReturn = true;
-    this.executor.init(
+  }
+
+  bindScriptExecutor(executor: ScriptExecutor): void {
+    executor.init(
       ['context', 'viewparams', 'data', 'env'],
       executeParams => {
         const { context, params, data } = executeParams;
@@ -28,6 +30,10 @@ export class ItemDynaLogicTrigger extends LogicTrigger {
           env: ibiz.env,
         };
       },
+      {
+        singleRowReturn: true,
+        isAsync: false,
+      },
     );
   }
 

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

@@ -6,6 +6,7 @@ import type {
   TriggerType,
 } from '../../interface';
 import { LogicExecutor } from '../executor/logic-executor';
+import { ScriptExecutor } from '../executor/script-executor';
 import { LogicScheduler } from '../scheduler/logic-scheduler';
 
 /**
@@ -51,6 +52,24 @@ export class LogicTrigger {
    */
   bindExecutor(executor: LogicExecutor): void {
     this.executor = executor;
+    if (this.executor.type === 'SCRIPT') {
+      this.bindScriptExecutor(executor as ScriptExecutor);
+    }
+  }
+
+  /**
+   * 绑定脚本执行器
+   * @author lxm
+   * @date 2023-08-21 04:33:35
+   * @param {ScriptExecutor} executor
+   */
+  bindScriptExecutor(executor: ScriptExecutor): void {
+    if (!executor.initialized) {
+      executor.init([], executeParams => executeParams, {
+        isAsync: true,
+        singleRowReturn: false,
+      });
+    }
   }
 
   /**

package/src/model/layout/layout.ts

@@ -145,5 +145,6 @@ export function calcGridLayoutPos(
 export function calcDynaClass(expression: string, data: IData): string[] {
   return ScriptFactory.execScriptFn({ data }, expression, {
     singleRowReturn: true,
+    isAsync: false,
   }) as string[];
 }

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,65 @@ 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,
+        {
+          isAsync: false,
+        },
+      ) 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, '自定义类型缺少配置脚本代码');