@ibiz-template/runtime 0.1.6 → 0.1.8

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

@@ -1,3 +1,4 @@
+import { I18n } from '@ibiz-template/core/src/interface';
 import { EngineFactory } from './engine';
 import { GlobalUtil } from './global';
 import {
@@ -5,15 +6,16 @@ import {
   INotificationUtil,
   IOpenViewUtil,
   IModalUtil,
+  IConfirmUtil,
   ILoadingUtil,
   IPluginFactory,
   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 {
@@ -45,6 +47,16 @@ declare module '@ibiz-template/core' {
      */
     modal: IModalUtil;
 
+    /**
+     * 确认框
+     *
+     * @description 需要用户确认收到提示消息时使用此工具
+     * @author chitanda
+     * @date 2022-08-17 16:08:10
+     * @type {IConfirmUtil}
+     */
+    confirm: IConfirmUtil;
+
     /**
      * 消息通知
      *
@@ -116,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;
 
     /**
      * 引擎工厂
@@ -137,6 +149,15 @@ declare module '@ibiz-template/core' {
      */
     util: GlobalUtil;
 
+    /**
+     * 多语言
+     *
+     * @author chitanda
+     * @date 2023-08-11 16:08:15
+     * @type {I18n}
+     */
+    i18n: I18n;
+
     /**
      * 逻辑调度中心
      * @author lxm

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, '自定义类型缺少配置脚本代码');

package/src/ui-logic/ui-logic-node/bind-param-node/bind-param-node.ts

@@ -0,0 +1,30 @@
+import { RuntimeModelError } from '@ibiz-template/core';
+import { IDEUIBindParamLogic } from '@ibiz/model-core';
+import { UILogicContext } from '../../ui-logic-context';
+import { handleSrcVal } from '../../utils';
+import { UILogicNode } from '../ui-logic-node';
+
+/**
+ * 绑定参数
+ *
+ * @author lxm
+ * @date 2023-02-09 21:02:20
+ * @export
+ * @class BindParamNode
+ * @extends {UILogicNode}
+ */
+export class BindParamNode extends UILogicNode {
+  declare model: IDEUIBindParamLogic;
+
+  async exec(ctx: UILogicContext): Promise<void> {
+    const { dstDEUILogicParamId, srcDEUILogicParamId } = this.model;
+    if (!dstDEUILogicParamId || !srcDEUILogicParamId) {
+      throw new RuntimeModelError(
+        this.model,
+        '缺少目标参数对象或者源参数对象配置',
+      );
+    }
+    const srcVal = handleSrcVal(ctx, this.model);
+    ctx.params[dstDEUILogicParamId] = srcVal;
+  }
+}

package/src/ui-logic/ui-logic-node/index.ts

@@ -5,3 +5,4 @@ export { EndNode } from './end-node/end-node';
 export { PrepareJSParamNode } from './prepare-js-param-node/prepare-js-param-node';
 export { UILogicNode } from './ui-logic-node';
 export { ViewCtrlInvokeNode } from './view-ctrl-invoke-node/view-ctrl-invoke-node';
+export { BindParamNode } from './bind-param-node/bind-param-node';

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

@@ -1,4 +1,4 @@
-import { ModelError, RuntimeError } from '@ibiz-template/core';
+import { ModelError, RuntimeModelError } from '@ibiz-template/core';
 import { IDEUILogicParam } from '@ibiz/model-core';
 import { UILogicContext } from '../ui-logic-context';
 
@@ -46,7 +46,10 @@ export class UILogicParam {
       if (control) {
         ctx.params[tag] = control;
       } else {
-        throw new RuntimeError(`没找到${m.codeName!}指定部件对象`);
+        throw new RuntimeModelError(
+          this.model,
+          `视图逻辑初始化参数，未找到${m.codeName!}指定部件对象`,
+        );
       }
     } else if (m.activeViewParam) {
       // 当前视图

package/src/ui-logic/ui-logic.ts

@@ -4,6 +4,7 @@ import { IDEUILogic } from '@ibiz/model-core';
 import { IUILogicParams } from '../interface';
 import { UILogicContext } from './ui-logic-context';
 import {
+  BindParamNode,
   DEActionNode,
   DEUIActionNode,
   EndNode,
@@ -72,12 +73,14 @@ export class UILogic {
         case 'PREPAREJSPARAM': // 准备参数
           logicNode = new PrepareJSParamNode(node);
           break;
-        case 'RESETPARAM': // 重置参数
-        case 'COPYPARAM': // 拷贝参数
         case 'BINDPARAM': // 绑定参数
+          logicNode = new BindParamNode(node);
+          break;
         case 'VIEWCTRLINVOKE': // 视图部件调用
           logicNode = new ViewCtrlInvokeNode(node);
           break;
+        case 'RESETPARAM': // 重置参数
+        case 'COPYPARAM': // 拷贝参数
         case 'VIEWCTRLFIREEVENT': // 视图部件事件触发
         case 'APPENDPARAM': // 附加到数组参数
         case 'SORTPARAM': // 排序数组参数

package/src/ui-logic/utils/handle-src-val.ts

@@ -34,13 +34,10 @@ export function handleSrcVal(
   ctx: UILogicContext,
   srcValParams: SrcValParams,
 ): unknown {
-  const { srcDEUILogicParamId, srcValueType, srcFieldName, srcValue } =
-    srcValParams;
-
+  const { srcDEUILogicParamId, srcFieldName, srcValue } = srcValParams;
   // 没有源值类型就是逻辑参数
-  if (!srcValParams.srcValueType) {
-    srcValParams.srcValueType = 'SRCDLPARAM';
-  }
+  const srcValueType = srcValParams.srcValueType || 'SRCDLPARAM';
+
   let value: unknown;
   switch (srcValueType) {
     // 源逻辑参数

package/src/utils/open-redirect-view/open-redirect-view.ts

@@ -7,7 +7,7 @@ import {
 import { RuntimeError, RuntimeModelError } from '@ibiz-template/core';
 import { isNilOrEmpty, notNilEmpty } from 'qx-util';
 import qs from 'qs';
-import { IModalData } from '../../interface';
+import { IModalData, IOpenViewOptions } from '../../interface';
 import { OpenAppViewCommand } from '../../command';
 import { convertNavData } from '../nav-params/nav-params';
 import { calcDeCodeNameById, findFieldById } from '../../model';
@@ -28,13 +28,13 @@ export async function openRedirectView(
   appView: IAppRedirectView,
   context: IContext,
   params: IParams = {},
-  data: IData[] = [],
+  opts: IOpenViewOptions = {},
 ): Promise<IModalData> {
   return openDERedirectView(
     appView as IAppDERedirectView,
     context,
     params,
-    data,
+    opts,
   );
 }
 
@@ -52,6 +52,7 @@ export async function openRedirectView(
 export async function toLocalOpenWFRedirectView(
   context: IContext,
   linkUrl: string,
+  opts: IOpenViewOptions = {},
 ): Promise<void> {
   const i = linkUrl.lastIndexOf('?');
   const queryStr: string = decodeURIComponent(
@@ -102,6 +103,7 @@ export async function toLocalOpenWFRedirectView(
     deRdView.id,
     context,
     params,
+    opts,
   );
 }
 
@@ -121,7 +123,7 @@ export async function openDERedirectView(
   appView: IAppDERedirectView,
   context: IContext,
   params: IParams = {},
-  data: IData[] = [],
+  opts: IOpenViewOptions = {},
 ): Promise<IModalData> {
   // 计算重定向视图上下文参数转换
   const navContext = appView.appViewNavContexts || [];
@@ -135,7 +137,7 @@ export async function openDERedirectView(
   // 重定向视图对应应用实体
   const entityId = appView.appDataEntityId!;
   const key = calcDeCodeNameById(entityId);
-  let curData: IData = data[0] || {};
+  let curData: IData = opts.data?.[0] || {};
   // 将数据主键转换到上下文当中
   context[key] = curData[key] || context[key] || params[key];
   // 实体重定向视图获取数据行为
@@ -171,7 +173,7 @@ export async function openDERedirectView(
           });
         }
         if (linkUrl.startsWith('appredirectview?')) {
-          await toLocalOpenWFRedirectView(context, linkUrl);
+          await toLocalOpenWFRedirectView(context, linkUrl, opts);
           return { ok: true, data: [] };
         }
         return { ok: false, data: [] };
@@ -191,10 +193,9 @@ export async function openDERedirectView(
   // 所有重定向引用视图
   const allRefViews = appView.redirectAppViewRefs;
   const refView = allRefViews?.find(view => {
+    const matchKey = view.name || view.id;
     // 特殊补充 wfRdTag 匹配，子流程应用特殊模式
-    return (
-      view.name === deRdTag || view.name === rdTag || view.name === wfRdTag
-    );
+    return matchKey === deRdTag || matchKey === rdTag || matchKey === wfRdTag;
   });
   if (refView) {
     const viewId = refView.refAppViewId;
@@ -204,7 +205,7 @@ export async function openDERedirectView(
         viewId,
         context,
         params,
-        { data: [curData] },
+        { ...opts, data: [curData] },
       );
       if (result) {
         return result;
@@ -248,16 +249,6 @@ export async function calcDERdTag(
   data: IData,
 ): Promise<string> {
   let rdTag = '';
-  const defView = `${ibiz.env.isMob ? 'MOB' : ''}EDITVIEW`;
-  // 如果流程步骤存在，按照工作流优先
-  const srfWf = params.srfwf;
-  if (notNilEmpty(srfWf)) {
-    if (notNilEmpty(params.wf)) {
-      return `${defView}:${srfWf.toUpperCase()}:${params.wf.toUpperCase()}`;
-    }
-    return `${defView}:${srfWf.toUpperCase()}`;
-  }
-  let typeValue = '';
   // 重定向视图自定义类别属性
   const typeFieldId = rdView.typeAppDEFieldId;
   // 自定义重定向
@@ -265,15 +256,27 @@ export async function calcDERdTag(
     const { codeName } = findFieldById(entity, typeFieldId)!;
     const value = data[codeName!.toLowerCase()];
     if (notNilEmpty(value)) {
-      typeValue = value;
+      return `${value}`;
     }
+    ibiz.log.warn(
+      `重定向视图[${rdView.name}]自定义类别属性[${typeFieldId}]值为空`,
+      data,
+    );
   }
-  if (isNilOrEmpty(typeValue)) {
-    // 从索引属性获取重定向视图类型
-    if (entity.indexTypeAppDEFieldId) {
-      const { codeName } = findFieldById(entity, entity.indexTypeAppDEFieldId)!;
-      typeValue = data[codeName!.toLowerCase()];
+  const defView = `${ibiz.env.isMob ? 'MOB' : ''}EDITVIEW`;
+  // 如果流程步骤存在，按照工作流优先
+  const srfWf = params.srfwf;
+  if (notNilEmpty(srfWf)) {
+    if (notNilEmpty(params.wf)) {
+      return `${defView}:${srfWf.toUpperCase()}:${params.wf.toUpperCase()}`;
     }
+    return `${defView}:${srfWf.toUpperCase()}`;
+  }
+  let typeValue = '';
+  // 从索引属性获取重定向视图类型
+  if (entity.indexTypeAppDEFieldId) {
+    const { codeName } = findFieldById(entity, entity.indexTypeAppDEFieldId)!;
+    typeValue = data[codeName!.toLowerCase()];
   }
   if (isNilOrEmpty(typeValue)) {
     // 从多表单属性判断重定向视图类型
@@ -283,7 +286,7 @@ export async function calcDERdTag(
     }
   }
   if (notNilEmpty(typeValue)) {
-    rdTag = `${defView}:${typeValue.toUpperCase()}`;
+    rdTag = `${defView}:${typeValue.toString().toUpperCase()}`;
   } else {
     rdTag = `${defView}`;
   }

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

@@ -25,7 +25,10 @@ export class ScriptFunction {
     this.options = options;
     const code = this.formatCode(scriptCode, options);
     this.calcArgKeys(argKeys, options);
-    this.scriptFn = new Function(...this.argKeys, code);
+    const fn = new Function(...this.argKeys, code);
+    this.scriptFn = function callBack(...args: unknown[]): unknown {
+      return fn.apply({}, args);
+    };
   }
 
   /**

package/out/service/service/auth/auth.service.d.ts

@@ -1,30 +0,0 @@
-import { IHttpResponse } from '@ibiz-template/core';
-/**
- * 认证服务
- *
- * @author chitanda
- * @date 2022-07-19 18:07:51
- * @export
- * @class AuthService
- */
-export declare class AuthService {
-    /**
-     * v7 uaa 登录
-     *
-     * @author chitanda
-     * @date 2022-07-19 18:07:54
-     * @param {string} loginname
-     * @param {string} password
-     * @return {*}  {Promise<IHttpResponse>}
-     */
-    v7login(loginname: string, password: string): Promise<IHttpResponse>;
-    /**
-     * v7 uaa 登出
-     *
-     * @author chitanda
-     * @date 2022-09-14 18:07:54
-     * @return {*}  {Promise<IHttpResponse>}
-     */
-    v7logout(): Promise<IHttpResponse>;
-}
-//# sourceMappingURL=auth.service.d.ts.map

package/out/service/service/auth/auth.service.d.ts.map

@@ -1 +0,0 @@
-{"version":3,"file":"auth.service.d.ts","sourceRoot":"","sources":["../../../../src/service/service/auth/auth.service.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,aAAa,EAAE,MAAM,qBAAqB,CAAC;AACpD;;;;;;;GAOG;AACH,qBAAa,WAAW;IACtB;;;;;;;;OAQG;IACG,OAAO,CAAC,SAAS,EAAE,MAAM,EAAE,QAAQ,EAAE,MAAM,GAAG,OAAO,CAAC,aAAa,CAAC;IAa1E;;;;;;OAMG;IACG,QAAQ,IAAI,OAAO,CAAC,aAAa,CAAC;CAIzC"}

package/out/service/service/auth/auth.service.js

@@ -1,37 +0,0 @@
-/**
- * 认证服务
- *
- * @author chitanda
- * @date 2022-07-19 18:07:51
- * @export
- * @class AuthService
- */
-export class AuthService {
-    /**
-     * v7 uaa 登录
-     *
-     * @author chitanda
-     * @date 2022-07-19 18:07:54
-     * @param {string} loginname
-     * @param {string} password
-     * @return {*}  {Promise<IHttpResponse>}
-     */
-    async v7login(loginname, password) {
-        const res = await ibiz.net.post('/v7/login', { loginname, password }, {}, {
-        // sass 模式下，注册在 sassMgr 管理平台的应用中心系统标识
-        // srfdcsystem: ibiz.env.dcSystem,
-        });
-        return res;
-    }
-    /**
-     * v7 uaa 登出
-     *
-     * @author chitanda
-     * @date 2022-09-14 18:07:54
-     * @return {*}  {Promise<IHttpResponse>}
-     */
-    async v7logout() {
-        const res = await ibiz.net.get('/v7/logout', {});
-        return res;
-    }
-}

package/src/service/service/auth/auth.service.ts

@@ -1,44 +0,0 @@
-import { IHttpResponse } from '@ibiz-template/core';
-/**
- * 认证服务
- *
- * @author chitanda
- * @date 2022-07-19 18:07:51
- * @export
- * @class AuthService
- */
-export class AuthService {
-  /**
-   * v7 uaa 登录
-   *
-   * @author chitanda
-   * @date 2022-07-19 18:07:54
-   * @param {string} loginname
-   * @param {string} password
-   * @return {*}  {Promise<IHttpResponse>}
-   */
-  async v7login(loginname: string, password: string): Promise<IHttpResponse> {
-    const res = await ibiz.net.post(
-      '/v7/login',
-      { loginname, password },
-      {},
-      {
-        // sass 模式下，注册在 sassMgr 管理平台的应用中心系统标识
-        // srfdcsystem: ibiz.env.dcSystem,
-      },
-    );
-    return res;
-  }
-
-  /**
-   * v7 uaa 登出
-   *
-   * @author chitanda
-   * @date 2022-09-14 18:07:54
-   * @return {*}  {Promise<IHttpResponse>}
-   */
-  async v7logout(): Promise<IHttpResponse> {
-    const res = await ibiz.net.get('/v7/logout', {});
-    return res;
-  }
-}