@ibiz-template/runtime 0.4.9 → 0.4.11

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

@@ -1,12 +1,114 @@
 import { IMDControlState } from './i-md-control.state';
+import { ITreeNodeData } from './i-tree.state';
 
 /**
  * 甘特图状态
  *
- * @author zhanghengfeng
- * @date 2023-12-08 15:12:40
+ * @author tony001
+ * @date 2023-12-11 17:12:57
  * @export
  * @interface IGanttState
- * @extends {IMDControlState}
+ * @extends {ITreeState}
  */
-export interface IGanttState extends IMDControlState {}
+export interface IGanttState extends IMDControlState {
+  items: IGanttNodeData[];
+
+  /**
+   * 树的根节点
+   *
+   * @type {IGanttNodeData}
+   * @memberof IGanttState
+   */
+  rootNodes: IGanttNodeData[];
+
+  /**
+   * 查询条件
+   *
+   * @author tony001
+   * @date 2023-12-11 18:12:20
+   * @type {string}
+   */
+  query: string;
+
+  /**
+   * 快速搜索占位符
+   *
+   * @author tony001
+   * @date 2023-12-11 18:12:29
+   * @type {string}
+   */
+  placeHolder: string;
+}
+
+/**
+ * 甘特图节点数据格式
+ *
+ * @author tony001
+ * @date 2023-12-11 17:12:51
+ * @export
+ * @interface IGanttNodeData
+ */
+export interface IGanttNodeData extends ITreeNodeData {
+  /**
+   * 编号
+   *
+   * @author tony001
+   * @date 2023-12-11 17:12:39
+   * @type {string}
+   */
+  sndataIteValue: string;
+
+  /**
+   * 开始时间
+   *
+   * @author tony001
+   * @date 2023-12-11 17:12:12
+   * @type {string}
+   */
+  beginDataItemValue: string;
+
+  /**
+   * 结束时间
+   *
+   * @author tony001
+   * @date 2023-12-11 17:12:52
+   * @type {string}
+   */
+  endDataItemValue: string;
+
+  /**
+   * 前置数据
+   *
+   * @author tony001
+   * @date 2023-12-11 17:12:13
+   * @type {(string | number)}
+   */
+  prevDataItemValue: string | number;
+
+  /**
+   * 完成量数据
+   *
+   * @author tony001
+   * @date 2023-12-11 17:12:26
+   * @type {(string | number)}
+   */
+  finishDataItemValue: string | number;
+
+  /**
+   * 总量数据项
+   *
+   * @author tony001
+   * @date 2023-12-11 17:12:43
+   * @type {(string | number)}
+   */
+  totalDataItemValue: string | number;
+
+  /**
+   * 子数据
+   *
+   * @author tony001
+   * @date 2023-12-11 18:12:16
+   * @type {(IGanttNodeData[] | undefined)}
+   */
+  children?: IGanttNodeData[] | undefined;
+}

package/src/interface/controller/state/view/i-de-index-view.state.ts

@@ -0,0 +1,19 @@
+import { IViewState } from './i-view.state';
+
+/**
+ * 实体首页视图UI状态
+ *
+ * @export
+ * @class IDEIndexViewState
+ * @extends {IViewState}
+ */
+export interface IDEIndexViewState extends IViewState {
+  /**
+   * 导航数据
+   *
+   * @author lxm
+   * @date 2023-12-11 06:23:55
+   * @type {string}
+   */
+  srfnav: string;
+}

package/src/interface/controller/state/view/i-edit-view2.state.ts

@@ -7,4 +7,13 @@ import { IEditViewState } from './i-edit-view.state';
  * @interface IEditView2State
  * @extends {IViewState}
  */
-export interface IEditView2State extends IEditViewState {}
+export interface IEditView2State extends IEditViewState {
+  /**
+   * 导航数据
+   *
+   * @author lxm
+   * @date 2023-12-11 06:23:55
+   * @type {string}
+   */
+  srfnav: string;
+}

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

@@ -45,3 +45,4 @@ export * from './i-chart-exp-view.state';
 export * from './i-map-view.state';
 export * from './i-report-view.state';
 export * from './i-gantt-view.state';
+export * from './i-de-index-view.state';

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

@@ -30,4 +30,13 @@ export interface IAuthService {
    * @return {*}  {Promise<boolean>}
    */
   logout(): Promise<boolean>;
+
+  /**
+   * 页面未关闭情况下，自动延长登录时间
+   *
+   * @author chitanda
+   * @date 2023-12-11 11:12:54
+   * @return {*}  {Promise<void>}
+   */
+  extendLogin(): Promise<void>;
 }

package/src/register/helper/ui-action-register.ts

@@ -39,7 +39,7 @@ export async function getUIActionProvider(
   model: IAppUIAction,
 ): Promise<IUIActionProvider> {
   let provider: IUIActionProvider | undefined;
-  const { uiactionMode, sysPFPluginId, appId } =
+  const { uiactionMode, sysPFPluginId, appId, uiactionTag } =
     model as Required<IAppUIAction>;
 
   // 找插件适配器
@@ -55,6 +55,12 @@ export async function getUIActionProvider(
     }
   }
 
+  // 先通过uiactionTag找界面行为适配器
+  provider = getProvider(`${uiactionMode}_${uiactionTag}`);
+  if (provider) {
+    return provider;
+  }
+
   // 找界面行为类型
   provider = getProvider(uiactionMode);
   if (!provider) {

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

@@ -1,5 +1,5 @@
 import { CoreConst, HttpError } from '@ibiz-template/core';
-import { clearCookie, setCookie } from 'qx-util';
+import { clearCookie, getCookie, setCookie } from 'qx-util';
 import { IAuthService } from '../../../interface';
 
 /**
@@ -25,10 +25,15 @@ export class V7AuthService implements IAuthService {
       });
       const { data } = res;
       if (data && data.token) {
-        setCookie(CoreConst.TOKEN, data.token, 0, true);
+        setCookie(CoreConst.TOKEN, data.token, rememberme ? 7 : 0, true);
         const expiredDate =
           new Date().getTime() + (data.expirein || 7199) * 1000;
-        setCookie(CoreConst.TOKEN_EXPIRES, `${expiredDate}`, 0, true);
+        setCookie(
+          CoreConst.TOKEN_EXPIRES,
+          `${expiredDate}`,
+          rememberme ? 7 : 0,
+          true,
+        );
       }
       return true;
     } catch (err: unknown) {
@@ -54,4 +59,26 @@ export class V7AuthService implements IAuthService {
     }
     return false;
   }
+
+  async extendLogin(): Promise<void> {
+    const token = getCookie(CoreConst.TOKEN);
+    const expirein = getCookie(CoreConst.TOKEN_EXPIRES);
+    if (token && expirein) {
+      // 计算到过期时间所需的延时毫秒数，预留提前量
+      let wait = Number(expirein) - new Date().getTime();
+      const early = 5 * 60 * 1000;
+      wait = wait > early ? wait - early : 0;
+      setTimeout(async () => {
+        const res = await ibiz.net.get(`/uaa/refreshtoken2`);
+        if (res.ok) {
+          setCookie(CoreConst.TOKEN, res.data.token, 0, true);
+          const expiredDate =
+            new Date().getTime() + (res.data.expirein || 7199) * 1000;
+          setCookie(CoreConst.TOKEN_EXPIRES, `${expiredDate}`, 0, true);
+        }
+        // 下一次延时做准备
+        this.extendLogin();
+      }, wait);
+    }
+  }
 }

package/src/service/service/entity/de.service.ts

@@ -67,7 +67,7 @@ export class DEService implements IAppDEService {
    * @date 2022-08-18 19:08:40
    * @type {DECache}
    */
-  readonly local: DECache = new DECache();
+  readonly local: DECache;
 
   /**
    * Creates an instance of EntityService.
@@ -77,6 +77,7 @@ export class DEService implements IAppDEService {
    * @param {IAppDataEntity} model 应用实体模型
    */
   constructor(protected model: IAppDataEntity) {
+    this.local = new DECache(model);
     this.configCache = new ConfigService(
       model.appId!,
       'PSAppDataEntity',

package/src/service/service/entity/method/de-action.ts

@@ -1,4 +1,5 @@
 import {
+  HttpError,
   HttpResponse,
   IHttpResponse,
   RuntimeError,
@@ -300,7 +301,7 @@ export class DEActionMethod extends Method {
       }
       return new HttpResponse(resultData);
     } catch (err) {
-      return new HttpResponse(err, 500);
+      throw new HttpError(err as Error);
     }
   }
 
@@ -357,7 +358,7 @@ export class DEActionMethod extends Method {
       }
       return new HttpResponse(data, 500);
     } catch (err) {
-      return new HttpResponse(err, 500);
+      throw new HttpError(err as Error);
     }
   }
 
@@ -390,7 +391,7 @@ export class DEActionMethod extends Method {
       }
       return new HttpResponse(resultData, 500);
     } catch (err) {
-      return new HttpResponse(err, 500);
+      throw new HttpError(err as Error);
     }
   }
 
@@ -423,7 +424,7 @@ export class DEActionMethod extends Method {
       }
       return new HttpResponse(data, 500);
     } catch (err) {
-      return new HttpResponse(err, 500);
+      throw new HttpError(err as Error);
     }
   }
 

package/src/service/utils/de-cache/de-cache.ts

@@ -1,10 +1,13 @@
 import { where, equals, clone, isNil, isEmpty } from 'ramda';
 import { createUUID } from 'qx-util';
+import { IAppDataEntity } from '@ibiz/model-core';
+import { RuntimeError } from '@ibiz-template/core';
 import {
   isExistSessionId,
   isExistSrfKey,
 } from '../service-exist-util/service-exist-util';
 import { IDataEntity } from '../../../interface';
+import { findModelChild } from '../../../model';
 
 /**
  * 实体缓存工具类
@@ -15,6 +18,20 @@ import { IDataEntity } from '../../../interface';
  * @class DECache
  */
 export class DECache {
+  /**
+   * 是否是联合主键
+   * @author lxm
+   * @date 2023-12-12 02:47:18
+   * @readonly
+   * @protected
+   * @type {boolean}
+   */
+  protected get isUnionKey(): boolean {
+    return !!this.entity.unionKeyValueAppDEFieldIds?.length;
+  }
+
+  constructor(protected entity: IAppDataEntity) {}
+
   /**
    * 数据缓存
    *
@@ -78,6 +95,16 @@ export class DECache {
    * @memberof EntityCache
    */
   add(context: IParams, entity: IDataEntity): IDataEntity | null {
+    // 联合主键相关数据处理
+    if (this.isUnionKey) {
+      this.calcUnionKey(entity);
+      if (this.checkData(context, entity.srfkey)) {
+        throw new RuntimeError(
+          `新建联合主键数据失败，已有主键为${entity.srfkey}的数据`,
+        );
+      }
+    }
+
     try {
       isExistSessionId('add', context);
       if (isNil(entity.srfkey) || isEmpty(entity.srfkey)) {
@@ -124,16 +151,28 @@ export class DECache {
    * @memberof EntityCache
    */
   update(context: IParams, entity: IDataEntity): IDataEntity | null {
+    const oldKey = entity.srfkey!;
+    // 联合主键相关数据处理
+    if (this.isUnionKey) {
+      this.calcUnionKey(entity);
+      // 主键改变的时候，检测变更之后的主键是否已经存在
+      if (oldKey !== entity.srfkey && this.checkData(context, entity.srfkey)) {
+        throw new RuntimeError(
+          `更新联合主键数据失败，已有主键为${entity.srfkey}的数据`,
+        );
+      }
+    }
+
     try {
       isExistSessionId('update', context);
       isExistSrfKey('update', entity);
       entity.srftempdate = new Date().getTime();
       const map = this.getCacheByTag(context);
-      const data = map.get(entity.srfkey!);
+      const data = map.get(oldKey);
       if (data) {
         data.assign!(entity);
-        map.set(entity.srfkey!, data);
-        ibiz.log.warn('update', entity.srfkey, entity);
+        map.set(oldKey, data);
+        ibiz.log.warn('update', oldKey, entity);
         return clone(data);
       }
       throw new Error('数据不存在，无法更新!');
@@ -366,4 +405,26 @@ export class DECache {
     }
     return this.cacheMap.get(tag)!;
   }
+
+  /**
+   * 根据联合键值计算主键并赋值
+   * @author lxm
+   * @date 2023-12-12 03:06:30
+   * @param {(IDataEntity | IDataEntity[])} data 需要计算的数据或数据集合
+   */
+  protected calcUnionKey(data: IDataEntity): void {
+    const unionKeys: string[] = this.entity.unionKeyValueAppDEFieldIds!.map(
+      id => {
+        const appField = findModelChild(this.entity.appDEFields || [], id);
+        return appField!.codeName!.toLowerCase();
+      },
+    );
+    const unionValues = unionKeys.map(key => {
+      if (isNil(data[key])) {
+        throw new RuntimeError(`联合键值计算异常，${key}属性为空值！`);
+      }
+      return data[key];
+    });
+    data.srfkey = unionValues.join('');
+  }
 }

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

@@ -0,0 +1,68 @@
+import { IDEGantt, IDETreeDataSetNode } from '@ibiz/model-core';
+import { CodeListItem, IGanttNodeData } from '../../../interface';
+import { TreeCodeListNodeData } from '../tree-node-data';
+import { calcDataItemValue } from './gantt-node-data-util';
+
+export class GanttCodeListNodeData
+  extends TreeCodeListNodeData
+  implements IGanttNodeData
+{
+  sndataIteValue: string;
+
+  beginDataItemValue: string;
+
+  endDataItemValue: string;
+
+  prevDataItemValue: string | number;
+
+  finishDataItemValue: string | number;
+
+  totalDataItemValue: string | number;
+
+  children?: IGanttNodeData[] | undefined;
+
+  constructor(
+    model: IDEGantt,
+    nodeModel: IDETreeDataSetNode,
+    parentNodeData: IGanttNodeData | undefined,
+    opts: {
+      data: CodeListItem;
+      leaf: boolean;
+      navContext?: IParams;
+      navParams?: IParams;
+    },
+  ) {
+    super(nodeModel, parentNodeData, opts);
+    const { data } = opts;
+    this.sndataIteValue = calcDataItemValue(
+      model.sndataItemName,
+      nodeModel,
+      data,
+    );
+    this.beginDataItemValue = calcDataItemValue(
+      model.beginDataItemName,
+      nodeModel,
+      data,
+    );
+    this.endDataItemValue = calcDataItemValue(
+      model.endDataItemName,
+      nodeModel,
+      data,
+    );
+    this.prevDataItemValue = calcDataItemValue(
+      model.prevDataItemName,
+      nodeModel,
+      data,
+    );
+    this.finishDataItemValue = calcDataItemValue(
+      model.finishDataItemName,
+      nodeModel,
+      data,
+    );
+    this.totalDataItemValue = calcDataItemValue(
+      model.totalDataItemName,
+      nodeModel,
+      data,
+    );
+  }
+}

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

@@ -0,0 +1,68 @@
+import { IDEGantt, IDETreeDataSetNode } from '@ibiz/model-core';
+import { IGanttNodeData } from '../../../interface';
+import { TreeDataSetNodeData } from '../tree-node-data';
+import { calcDataItemValue } from './gantt-node-data-util';
+
+export class GanttDataSetNodeData
+  extends TreeDataSetNodeData
+  implements IGanttNodeData
+{
+  sndataIteValue: string;
+
+  beginDataItemValue: string;
+
+  endDataItemValue: string;
+
+  prevDataItemValue: string | number;
+
+  finishDataItemValue: string | number;
+
+  totalDataItemValue: string | number;
+
+  children?: IGanttNodeData[] | undefined;
+
+  constructor(
+    model: IDEGantt,
+    nodeModel: IDETreeDataSetNode,
+    parentNodeData: IGanttNodeData | undefined,
+    opts: {
+      data: IData;
+      leaf: boolean; // 是否有子节点关系
+      navContext?: IParams;
+      navParams?: IParams;
+    },
+  ) {
+    super(nodeModel, parentNodeData, opts);
+    const { data } = opts;
+    this.sndataIteValue = calcDataItemValue(
+      model.sndataItemName,
+      nodeModel,
+      data,
+    );
+    this.beginDataItemValue = calcDataItemValue(
+      model.beginDataItemName,
+      nodeModel,
+      data,
+    );
+    this.endDataItemValue = calcDataItemValue(
+      model.endDataItemName,
+      nodeModel,
+      data,
+    );
+    this.prevDataItemValue = calcDataItemValue(
+      model.prevDataItemName,
+      nodeModel,
+      data,
+    );
+    this.finishDataItemValue = calcDataItemValue(
+      model.finishDataItemName,
+      nodeModel,
+      data,
+    );
+    this.totalDataItemValue = calcDataItemValue(
+      model.totalDataItemName,
+      nodeModel,
+      data,
+    );
+  }
+}

package/src/service/vo/gantt-node-data/gantt-node-data-util.ts

@@ -0,0 +1,26 @@
+import { IDETreeNode, IDETreeNodeDataItem } from '@ibiz/model-core';
+
+/**
+ * 计算数据项
+ * @param nodeModel
+ * @param fieldCodeName
+ * @returns
+ */
+export const calcDataItemValue = (
+  fieldCodeName: string | undefined,
+  nodeModel: IDETreeNode,
+  data: IData = {},
+): string => {
+  let result: string = '';
+  if (!fieldCodeName || !nodeModel.detreeNodeDataItems) {
+    return result;
+  }
+  const targetTreeNodeDataItem: IDETreeNodeDataItem | undefined =
+    nodeModel.detreeNodeDataItems.find((nodeDataItem: IDETreeNodeDataItem) => {
+      return nodeDataItem.id === fieldCodeName;
+    });
+  if (targetTreeNodeDataItem && targetTreeNodeDataItem.appDEFieldId) {
+    result = data[targetTreeNodeDataItem.appDEFieldId];
+  }
+  return result;
+};

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

@@ -0,0 +1,50 @@
+import { IDEGantt, IDETreeNode } from '@ibiz/model-core';
+import { IGanttNodeData } from '../../../interface';
+import { TreeStaticNodeData } from '../tree-node-data';
+import { calcDataItemValue } from './gantt-node-data-util';
+
+export class GanttStaticNodeData
+  extends TreeStaticNodeData
+  implements IGanttNodeData
+{
+  sndataIteValue: string;
+
+  beginDataItemValue: string;
+
+  endDataItemValue: string;
+
+  prevDataItemValue: string | number;
+
+  finishDataItemValue: string | number;
+
+  totalDataItemValue: string | number;
+
+  children?: IGanttNodeData[] | undefined;
+
+  constructor(
+    model: IDEGantt,
+    nodeModel: IDETreeNode,
+    parentNodeData: IGanttNodeData | undefined,
+    opts: { parentValueLevel?: number; leaf: boolean },
+  ) {
+    super(nodeModel, parentNodeData, opts);
+    this.sndataIteValue = calcDataItemValue(model.sndataItemName, nodeModel);
+    this.beginDataItemValue = calcDataItemValue(
+      model.beginDataItemName,
+      nodeModel,
+    );
+    this.endDataItemValue = calcDataItemValue(model.endDataItemName, nodeModel);
+    this.prevDataItemValue = calcDataItemValue(
+      model.prevDataItemName,
+      nodeModel,
+    );
+    this.finishDataItemValue = calcDataItemValue(
+      model.finishDataItemName,
+      nodeModel,
+    );
+    this.totalDataItemValue = calcDataItemValue(
+      model.totalDataItemName,
+      nodeModel,
+    );
+  }
+}

package/src/service/vo/gantt-node-data/index.ts

@@ -0,0 +1,3 @@
+export { GanttStaticNodeData } from './gantt-static-node-data';
+export { GanttDataSetNodeData } from './gantt-data-set-node-data';
+export { GanttCodeListNodeData } from './gantt-code-list-node-data';

package/src/service/vo/index.ts

@@ -5,3 +5,4 @@ export * from './calendar-item-data';
 export * from './map-data';
 export * from './panel-data';
 export * from './chart-data';
+export * from './gantt-node-data';

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

@@ -4,6 +4,7 @@ import { SysUIActionProvider } from './sys-ui-action-provider';
 import { FrontUIActionProvider } from './front-ui-action-provider';
 import { WFWithdrawUIActionProvider } from './wf-withdraw-ui-action-provider';
 import { UIActionProviderBase } from './ui-action-provider-base';
+import { LoginOutUIActionProvider } from './loginout-ui-action-provider';
 
 /**
  * 预置默认的界面行为适配器
@@ -30,6 +31,9 @@ export function presetUIActionProvider(): void {
     'DEUIACTION_WFWithdraw',
     () => wfWithdrawUIActionProvider,
   );
+  // 预置登出界面行为适配器
+  const loginOutUIActionProvider = new LoginOutUIActionProvider();
+  registerUIActionProvider('SYS_Logout', () => loginOutUIActionProvider);
 }
 
 export {

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

@@ -0,0 +1,31 @@
+import { IAppDEUIAction } from '@ibiz/model-core';
+import { IUIActionResult, IUILogicParams } from '../../interface';
+import { UIActionProviderBase } from './ui-action-provider-base';
+
+/**
+ * 系统登出界面行为适配器
+ *
+ * @author zk
+ * @date 2023-12-11 07:12:49
+ * @export
+ * @class LoginOutUIActionProvider
+ * @extends {UIActionProviderBase}
+ */
+export class LoginOutUIActionProvider extends UIActionProviderBase {
+  async execAction(
+    _action: IAppDEUIAction,
+    _params: IUILogicParams,
+  ): Promise<IUIActionResult> {
+    const confirm = await ibiz.confirm.info({
+      title: '确认退出登录',
+      desc: '您确定要退出登录吗？退出后您将无法继续访问已登录状态的功能和信息，请确保您已保存所有未完成的操作。',
+    });
+    if (confirm) {
+      const bol = await ibiz.auth.logout();
+      if (bol) {
+        window.location.reload();
+      }
+    }
+    return {};
+  }
+}