@ibiz-template/runtime 0.4.10 → 0.4.12

package/src/controller/control/wizard-panel/wizard-panel.controller.ts

@@ -93,6 +93,14 @@ export class WizardPanelController
    */
   stepTags: IData = {};
 
+  /**
+   * 向导表单数据
+   * @return {*}
+   * @author: zhujiamin
+   * @Date: 2023-12-12 13:43:07
+   */
+  formData: IData = {};
+
   protected initState(): void {
     super.initState();
   }
@@ -185,11 +193,12 @@ export class WizardPanelController
    * @author: zhujiamin
    * @Date: 2023-06-07 15:14:05
    */
-  onFormMounted(activeFormTag: string, event: EventBase): void {
+  async onFormMounted(activeFormTag: string, event: EventBase): Promise<void> {
     const formController = event.ctrl as EditFormController;
     this.formControllers.set(activeFormTag, formController);
     // 调用表单的load加载一次数据
-    formController.load();
+    const data = await formController.load();
+    Object.assign(this.formData, data);
   }
 
   /**
@@ -201,6 +210,7 @@ export class WizardPanelController
    */
   onFormSaved(event: EventBase): void {
     const data = event.data[0];
+    Object.assign(this.formData, data);
     const deName = calcDeCodeNameById(this.model.appDataEntityId!);
     if (!this.context[deName] && data && data.srfkey) {
       this.context[deName] = data.srfkey;
@@ -239,9 +249,10 @@ export class WizardPanelController
   async initialize(): Promise<void> {
     const initAction = this.model.initControlAction?.appDEMethodId;
     if (initAction) {
-      const res = await this.service.initialize(this.context, this.params);
+      const res = await this.service.initialize(this.context, {}, this.params);
       const deName = calcDeCodeNameById(this.model.appDataEntityId!);
       if (res.data && res.data.srfkey) {
+        this.formData = res.data;
         this.context[deName] = res.data.srfkey;
       }
       // 初始化时状态向导面板根据状态属性去决定当前激活哪个表单
@@ -274,7 +285,7 @@ export class WizardPanelController
    * @memberof WizardPanelController
    */
   async finish(): Promise<void> {
-    await this.service.finish(this.context, this.params);
+    await this.service.finish(this.context, this.formData, this.params);
     this.evt.emit('onFinishSuccess', undefined);
   }
 
@@ -286,11 +297,20 @@ export class WizardPanelController
    * @memberof WizardPanelController
    */
   async onPrevClick(): Promise<void> {
-    // 先执行表单返回行为
-    const data = await this.activeFormController.goBack();
+    // 状态向导先执行表单返回行为
+    let data;
+    if (
+      (this.activeFormController.model as IDEWizardEditForm).goBackControlAction
+    ) {
+      data = await this.activeFormController.goBack();
+    }
     let prevTag;
     // 返回上一个表单优先级 stateAppDEFieldId > tagHistory
-    if (this.model.stateAppDEFieldId && data[this.model.stateAppDEFieldId]) {
+    if (
+      this.model.stateAppDEFieldId &&
+      data &&
+      data[this.model.stateAppDEFieldId]
+    ) {
       const wizardForm = this.getWizardFormByTag(
         data[this.model.stateAppDEFieldId],
       );

package/src/interface/common/i-global-config/i-global-view-config.ts

@@ -29,4 +29,12 @@ export interface IGlobalViewConfig {
    * @type {string}
    */
   expCacheMode: string;
+
+  /**
+   * 首页是否不采用分页导航模式
+   * @return {*}
+   * @author: zhujiamin
+   * @Date: 2023-12-12 17:40:44
+   */
+  noNavTabs: boolean;
 }

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

@@ -60,6 +60,22 @@ export interface IControlController<
    */
   endLoading(): Promise<void>;
 
+  /**
+   * 部件激活，主要用于用户可见时设置为激活状态
+   *
+   * @author chitanda
+   * @date 2023-12-13 11:12:04
+   */
+  onActivated(): void;
+
+  /**
+   * 部件暂停激活，主要用于用户不可见时设置为非激活状态
+   *
+   * @author chitanda
+   * @date 2023-12-13 11:12:06
+   */
+  onDeactivated(): void;
+
   /**
    * 在不改变引用的前提下，更新上下文和导航参数
    * 并处理如自定义导航参数的后续处理

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

@@ -19,4 +19,12 @@ export interface IDRBarController
    * @memberof IDRBarController
    */
   getData(): IData[];
+
+  /**
+   * 处理选中改变
+   *
+   * @param {string} key
+   * @memberof DRBarController
+   */
+  handleSelectChange(key: string): void;
 }

package/src/interface/controller/controller/view/i-view.controller.ts

@@ -162,4 +162,20 @@ export interface IViewController<
    * @date 2022-09-19 14:09:09
    */
   endLoading(): void;
+
+  /**
+   * 视图激活，主要用于用户可见时设置为激活状态
+   *
+   * @author chitanda
+   * @date 2023-12-13 11:12:04
+   */
+  onActivated(): void;
+
+  /**
+   * 视图暂停激活，主要用于用户不可见时设置为非激活状态
+   *
+   * @author chitanda
+   * @date 2023-12-13 11:12:06
+   */
+  onDeactivated(): void;
 }

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

@@ -0,0 +1,12 @@
+import { IViewEvent } from '.';
+
+/**
+ * 实体首页视图事件
+ *
+ * @author lxm
+ * @date 2022-09-26 20:09:17
+ * @export
+ * @interface IDEIndexViewEvent
+ * @extends {IViewEvent}
+ */
+export type IDEIndexViewEvent = IViewEvent;

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

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

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

@@ -1,6 +1,15 @@
 import { IControllerState } from '../common/i-controller.state';
 
 export interface IControlState extends IControllerState {
+  /**
+   * 当前部件是否为激活状态(缓存下的激活状态，一般与框架的生命周期相同)
+   *
+   * @author chitanda
+   * @date 2023-12-13 11:12:30
+   * @type {boolean}
+   */
+  activated: boolean;
+
   /**
    * 是否是简单模式
    * @author zjm

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

@@ -9,6 +9,38 @@ import { IControlState } from './i-control.state';
  * @extends {IControlState}
  */
 export interface IDRBarState extends IControlState {
+  /**
+   * 默认显示的项的id
+   * @author lxm
+   * @date 2023-12-11 05:53:27
+   * @type {string}
+   */
+  defaultItem: string;
+
+  /**
+   * 选中的项的id
+   * @author lxm
+   * @date 2023-12-11 07:10:05
+   * @type {string}
+   */
+  selectedItem: string;
+
+  /**
+   * 隐藏编辑项
+   * @type {boolean}
+   * @default false
+   * 来源  isHideEditItem
+   */
+  hideEditItem?: boolean;
+
+  /**
+   * 导航数据
+   * @author lxm
+   * @date 2023-12-11 05:52:57
+   * @type {string}
+   */
+  srfnav: string;
+
   /**
    * 关系项集合
    *
@@ -41,14 +73,6 @@ export interface IDRBarItemsState {
    */
   caption?: string;
 
-  /**
-   * 是否隐藏
-   *
-   * @type {boolean}
-   * @memberof IDRBarItemsState
-   */
-  hidden: boolean;
-
   /**
    * 是否禁用
    *

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/i-view.state.ts

@@ -9,6 +9,15 @@ import { IControllerState } from '../common/i-controller.state';
  * @class ViewState
  */
 export interface IViewState extends IControllerState, IViewSession {
+  /**
+   * 当前视图是否为激活状态(缓存下的激活状态，一般与框架的生命周期相同)
+   *
+   * @author chitanda
+   * @date 2023-12-13 11:12:20
+   * @type {boolean}
+   */
+  activated: boolean;
+
   /**
    * 视图标题
    *

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

@@ -11,15 +11,16 @@ export interface IAuthService {
    * 登录
    *
    * @author chitanda
-   * @date 2023-08-17 16:08:23
+   * @date 2023-12-13 15:12:16
    * @param {string} loginName
    * @param {string} password
+   * @param {boolean} [remember]
    * @return {*}  {Promise<boolean>}
    */
   login(
     loginName: string,
     password: string,
-    rememberme?: boolean,
+    remember?: boolean,
   ): Promise<boolean>;
 
   /**

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

@@ -12,26 +12,29 @@ import { IAuthService } from '../../../interface';
  */
 export class V7AuthService implements IAuthService {
   async login(
-    loginname: string,
+    loginName: string,
     password: string,
-    rememberme?: boolean,
+    remember?: boolean,
   ): Promise<boolean> {
     // eslint-disable-next-line no-useless-catch
     try {
       const res = await ibiz.net.post('/v7/login', {
-        loginname,
+        loginname: loginName,
         password,
-        rememberme,
+        rememberme: remember,
       });
       const { data } = res;
       if (data && data.token) {
-        setCookie(CoreConst.TOKEN, data.token, rememberme ? 7 : 0, true);
+        if (remember) {
+          setCookie(CoreConst.TOKEN_REMEMBER, '1', 7, true);
+        }
+        setCookie(CoreConst.TOKEN, data.token, remember ? 7 : 0, true);
         const expiredDate =
           new Date().getTime() + (data.expirein || 7199) * 1000;
         setCookie(
           CoreConst.TOKEN_EXPIRES,
           `${expiredDate}`,
-          rememberme ? 7 : 0,
+          remember ? 7 : 0,
           true,
         );
       }
@@ -50,6 +53,7 @@ export class V7AuthService implements IAuthService {
       await ibiz.net.get('/v7/logout');
       clearCookie(CoreConst.TOKEN);
       clearCookie(CoreConst.TOKEN_EXPIRES);
+      clearCookie(CoreConst.TOKEN_REMEMBER);
       return true;
     } catch (err: unknown) {
       ibiz.notification.error({
@@ -63,6 +67,7 @@ export class V7AuthService implements IAuthService {
   async extendLogin(): Promise<void> {
     const token = getCookie(CoreConst.TOKEN);
     const expirein = getCookie(CoreConst.TOKEN_EXPIRES);
+    const remember = getCookie(CoreConst.TOKEN_REMEMBER);
     if (token && expirein) {
       // 计算到过期时间所需的延时毫秒数，预留提前量
       let wait = Number(expirein) - new Date().getTime();
@@ -71,10 +76,15 @@ export class V7AuthService implements IAuthService {
       setTimeout(async () => {
         const res = await ibiz.net.get(`/uaa/refreshtoken2`);
         if (res.ok) {
-          setCookie(CoreConst.TOKEN, res.data.token, 0, true);
+          setCookie(CoreConst.TOKEN, res.data.token, remember ? 7 : 0, true);
           const expiredDate =
             new Date().getTime() + (res.data.expirein || 7199) * 1000;
-          setCookie(CoreConst.TOKEN_EXPIRES, `${expiredDate}`, 0, true);
+          setCookie(
+            CoreConst.TOKEN_EXPIRES,
+            `${expiredDate}`,
+            remember ? 7 : 0,
+            true,
+          );
         }
         // 下一次延时做准备
         this.extendLogin();

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);
     }
   }