@ibiz-template/runtime 0.4.11 → 0.4.13

package/src/controller/common/view/view.controller.ts

@@ -94,10 +94,16 @@ export class ViewController<
     return this.ctx.parent?.view;
   }
 
-  protected _isActive = true;
-
+  /**
+   * 当前是否为激活状态(缓存下的激活状态，一般与框架的生命周期相同)
+   *
+   * @author chitanda
+   * @date 2023-12-13 11:12:48
+   * @readonly
+   * @type {boolean}
+   */
   get isActive(): boolean {
-    return this._isActive;
+    return this.state.activated;
   }
 
   /**
@@ -148,7 +154,7 @@ export class ViewController<
    * @date 2023-07-12 17:07:55
    */
   onActivated(): void {
-    this._isActive = true;
+    this.state.activated = true;
     ibiz.log.debug(`视图[${this.model.name}](${this.model.id})激活`);
   }
 
@@ -159,7 +165,7 @@ export class ViewController<
    * @date 2023-07-12 17:07:06
    */
   onDeactivated(): void {
-    this._isActive = false;
+    this.state.activated = false;
     ibiz.log.debug(`视图[${this.model.name}](${this.model.id})暂停`);
   }
 
@@ -224,6 +230,7 @@ export class ViewController<
 
   protected initState(): void {
     super.initState();
+    this.state.activated = true;
     this.state.isLoading = false;
     this.state.caption = this.model.caption!;
     this.state.srfactiveviewdata = null;
@@ -485,4 +492,19 @@ export class ViewController<
       this.alertViewMessage(rest);
     }
   }
+
+  /**
+   * 转换各类多语言
+   *
+   * @date 2023-05-18 02:57:00
+   * @protected
+   */
+  protected convertMultipleLanguages(): void {
+    if (this.model.capLanguageRes && this.model.capLanguageRes.lanResTag) {
+      this.model.caption = ibiz.i18n.t(
+        this.model.capLanguageRes.lanResTag,
+        this.model.caption,
+      );
+    }
+  }
 }

package/src/controller/control/app-menu/app-menu.controller.ts

@@ -170,4 +170,29 @@ export class AppMenuController
     }
     return null;
   }
+
+  /**
+   * 转换各类多语言
+   *
+   * @date 2023-05-18 02:57:00
+   * @protected
+   */
+  protected convertMultipleLanguages(): void {
+    const convertItemCaption = (menuItems: IAppMenuItem[]): void => {
+      menuItems.forEach((item: IAppMenuItem) => {
+        if (item.capLanguageRes && item.capLanguageRes.lanResTag) {
+          item.caption = ibiz.i18n.t(
+            item.capLanguageRes.lanResTag,
+            item.caption,
+          );
+        }
+        if (item.appMenuItems?.length) {
+          convertItemCaption(item.appMenuItems);
+        }
+      });
+    };
+    if (this.model.appMenuItems && this.model.appMenuItems.length > 0) {
+      convertItemCaption(this.model.appMenuItems);
+    }
+  }
 }

package/src/controller/control/caption-bar/caption-bar.controller.ts

@@ -21,14 +21,7 @@ export class CaptionBarController
 {
   protected initState(): void {
     super.initState();
-    if (this.view.model.capLanguageRes) {
-      this.state.caption = ibiz.i18n.t(
-        this.view.model.capLanguageRes.lanResTag!,
-        this.view.model.caption,
-      );
-    } else {
-      this.state.caption = this.view.model.caption!;
-    }
+    this.state.caption = this.view.model.caption!;
   }
 
   protected async onCreated(): Promise<void> {

package/src/controller/control/form/edit-form/edit-form.controller.ts

@@ -3,7 +3,6 @@ import {
   IHttpResponse,
   mergeInLeft,
   RuntimeError,
-  mergeDefaultInLeft,
 } from '@ibiz-template/core';
 import { IAppDEEditView, IDEEditForm } from '@ibiz/model-core';
 import { debounce } from 'lodash-es';
@@ -92,9 +91,6 @@ export class EditFormController
    */
   async loadDraft(args?: IDataAbilityParams): Promise<IData> {
     const { context, params: queryParams } = this.handlerAbilityParams(args);
-    // 新建默认值给到graft接口，接口会回来
-    const params = await this.getDraftParams(); // 新建默认值
-    Object.assign(queryParams, params);
 
     let res;
     try {
@@ -112,9 +108,6 @@ export class EditFormController
     }
 
     this.state.data = res.data;
-    // 处理后台导致的新建默认值丢失
-    mergeDefaultInLeft(this.data, params);
-
     this.formStateNotify(FormNotifyState.DRAFT);
 
     await this.evt.emit('onLoadDraftSuccess', undefined);
@@ -293,12 +286,10 @@ export class EditFormController
         default: `${this.data.srfmajortext || ''}保存成功`,
       });
     }
-    if (this.view.modal.mode === 'ROUTE') {
-      ibiz.mc.command.send(
-        this.data.$origin,
-        isCreate ? 'OBJECTCREATED' : 'OBJECTUPDATED',
-      );
-    }
+    ibiz.mc.command.send(
+      this.data.$origin,
+      isCreate ? 'OBJECTCREATED' : 'OBJECTUPDATED',
+    );
     return this.data;
   }
 
@@ -346,9 +337,7 @@ export class EditFormController
     await this.evt.emit('onRemoveSuccess', undefined);
     this.actionNotification('REMOVESUCCESS');
 
-    if (this.view.modal.mode === 'ROUTE') {
-      ibiz.mc.command.send(this.data.$origin, 'OBJECTREMOVED');
-    }
+    ibiz.mc.command.send(this.data.$origin, 'OBJECTREMOVED');
 
     return ok;
   }
@@ -463,11 +452,9 @@ export class EditFormController
     const { context, params } = this.handlerAbilityParams(args);
     try {
       await this.service.wfStart(context, params, this.data);
-      if (this.view.modal.mode === 'ROUTE') {
-        ibiz.mc.command.send(this.data.$origin, 'OBJECTUPDATED');
-        // 刷新预定义todo实体数据
-        ibiz.mc.command.send({ srfdecodename: 'SysTodo' }, 'OBJECTUPDATED');
-      }
+      ibiz.mc.command.send(this.data.$origin, 'OBJECTUPDATED');
+      // 刷新预定义todo实体数据
+      ibiz.mc.command.send({ srfdecodename: 'SysTodo' }, 'OBJECTUPDATED');
     } catch (error) {
       this.actionNotification('WFSTARTERROR', {
         error: error as Error,
@@ -497,11 +484,9 @@ export class EditFormController
     const { context, params } = this.handlerAbilityParams(args);
     try {
       await this.service.wfSubmit(context, params, this.data);
-      if (this.view.modal.mode === 'ROUTE') {
-        ibiz.mc.command.send(this.data.$origin, 'OBJECTUPDATED');
-        // 刷新预定义todo实体数据
-        ibiz.mc.command.send({ srfdecodename: 'SysTodo' }, 'OBJECTUPDATED');
-      }
+      ibiz.mc.command.send(this.data.$origin, 'OBJECTUPDATED');
+      // 刷新预定义todo实体数据
+      ibiz.mc.command.send({ srfdecodename: 'SysTodo' }, 'OBJECTUPDATED');
     } catch (error) {
       this.actionNotification('WFSUBMITERROR', {
         error: error as Error,

package/src/controller/control/form/edit-form/edit-form.service.ts

@@ -10,11 +10,12 @@ import {
   IDEWizardEditForm,
   IWFEditForm,
 } from '@ibiz/model-core';
-import { ControlService, ControlVO, UIMapField } from '../../../../service';
+import { ControlVO, UIMapField } from '../../../../service';
+import { FormService } from '../form/form.service';
 
 export class EditFormService<
   T extends IDEEditForm = IDEEditForm,
-> extends ControlService<T> {
+> extends FormService<T> {
   /**
    * 执行获取单条数据方法
    *
@@ -35,6 +36,10 @@ export class EditFormService<
       params,
     );
     res = this.handleResponse(res);
+    // 设置默认值
+    if (res.ok && res.data) {
+      this.setDefault(res.data, context, params, 'update');
+    }
     return res as IHttpResponse<ControlVO>;
   }
 
@@ -58,6 +63,10 @@ export class EditFormService<
       params,
     );
     res = this.handleResponse(res);
+    // 设置默认值
+    if (res.ok && res.data) {
+      this.setDefault(res.data, context, params, 'create');
+    }
     return res as IHttpResponse<ControlVO>;
   }
 

package/src/controller/control/form/form/form.controller.ts

@@ -158,20 +158,6 @@ export abstract class FormController<
     });
   }
 
-  /**
-   * 获取加载草稿额外参数，新建默认值
-   * @author lxm
-   * @date 2023-04-27 10:32:06
-   * @return {*}
-   */
-  async getDraftParams(): Promise<IData> {
-    const result: IData = {};
-    await Promise.all(
-      this.formItems.map(item => item.setDefaultValue(true, result)),
-    );
-    return result;
-  }
-
   /**
    * 初始化表单成员控制器
    *

package/src/controller/control/form/form/form.service.ts

@@ -0,0 +1,63 @@
+import { IDEEditFormItem, IDEForm } from '@ibiz/model-core';
+import { recursiveIterate } from '@ibiz-template/core';
+import { ControlService } from '../../../../service';
+import { getDefaultValue } from '../../../utils';
+
+/**
+ * 表单的部件服务
+ * @author lxm
+ * @date 2023-12-13 03:04:57
+ * @export
+ * @class FormService
+ * @extends {ControlService<T>}
+ * @template T
+ */
+export class FormService<
+  T extends IDEForm = IDEForm,
+> extends ControlService<T> {
+  /**
+   * 设置表单项的默认值
+   * @author lxm
+   * @date 2023-12-13 03:16:19
+   * @param {IData} data 表单数据
+   * @param {IParams} context 上下文
+   * @param {IParams} params 视图参数
+   * @param {('create' | 'update')} type 新建还是更新
+   */
+  setDefault(
+    data: IData,
+    context: IParams,
+    params: IParams,
+    type: 'create' | 'update',
+  ): void {
+    // 递归所有的表单项，设置默认值
+    recursiveIterate(
+      this.model,
+      (item: IDEEditFormItem) => {
+        if (item.detailType === 'FORMITEM') {
+          const { createDVT, createDV, updateDVT, updateDV, valueFormat } =
+            item;
+          const valueType = type === 'create' ? createDVT : updateDVT;
+          const defaultValue = type === 'create' ? createDV : updateDV;
+          const name = item.id!.toLowerCase();
+
+          const defaultVal = getDefaultValue(
+            {
+              name,
+              valueType,
+              defaultValue,
+              valueFormat,
+            },
+            { data, context, params },
+          );
+          if (defaultVal !== undefined) {
+            data[name] = defaultVal;
+          }
+        }
+      },
+      {
+        childrenFields: ['deformPages', 'deformTabPages', 'deformDetails'],
+      },
+    );
+  }
+}

package/src/controller/control/form/form-detail/form-detail/form-detail.controller.ts

@@ -154,7 +154,7 @@ export class FormDetailController<T extends IDEFormDetail = IDEFormDetail>
     this.state.showMoreMode = this.model.showMoreMode!;
 
     // 初始化布局参数
-    const { layoutPos, sysCss, labelSysCss } = this.model;
+    const { layoutPos, sysCss, labelSysCss, capLanguageRes } = this.model;
 
     // 初始化高宽
     if (layoutPos) {
@@ -170,6 +170,14 @@ export class FormDetailController<T extends IDEFormDetail = IDEFormDetail>
     if (labelSysCss?.cssName) {
       this.state.class.label.push(labelSysCss.cssName);
     }
+
+    // 初始化多语言
+    if (capLanguageRes && capLanguageRes.lanResTag) {
+      this.model.caption = ibiz.i18n.t(
+        capLanguageRes.lanResTag,
+        this.model.caption,
+      );
+    }
   }
 
   /**

package/src/controller/control/form/form-detail/form-item/form-item.controller.ts

@@ -283,11 +283,6 @@ export class FormItemController
 
     // 计算启用条件
     this.calcEnableCond();
-
-    // 触发默认值
-    if (state === FormNotifyState.LOAD) {
-      this.setDefaultValue(false);
-    }
   }
 
   protected calcDynamicLogic(names: string[], mustCalc: boolean = false): void {

package/src/controller/control/form/search-form/search-form.controller.ts

@@ -1,4 +1,4 @@
-import { RuntimeError, mergeDefaultInLeft } from '@ibiz-template/core';
+import { RuntimeError } from '@ibiz-template/core';
 import { IDESearchForm } from '@ibiz/model-core';
 import {
   ISearchFormController,
@@ -77,9 +77,6 @@ export class SearchFormController
   async load(): Promise<IData> {
     const queryParams = { ...this.params };
 
-    // 新建默认值给到graft接口，接口会回来
-    const params = await this.getDraftParams();
-    Object.assign(queryParams, params);
     await this.evt.emit('onBeforeLoadDraft', { params: queryParams });
     let res;
     try {
@@ -91,7 +88,6 @@ export class SearchFormController
       throw error;
     }
     this.state.data = res.data;
-    mergeDefaultInLeft(this.data, params);
     this.state.isLoaded = true;
     this.formStateNotify(FormNotifyState.DRAFT);
     this.actionNotification('GETDRAFTSUCCESS');

package/src/controller/control/form/search-form/search-form.service.ts

@@ -1,6 +1,7 @@
 import { IHttpResponse, recursiveIterate } from '@ibiz-template/core';
 import { IDESearchForm, IDEFormDetail } from '@ibiz/model-core';
-import { ControlService, ControlVO, UIMapField } from '../../../../service';
+import { ControlVO, UIMapField } from '../../../../service';
+import { FormService } from '../form/form.service';
 
 /**
  * 搜索表单服务
@@ -14,7 +15,7 @@ import { ControlService, ControlVO, UIMapField } from '../../../../service';
  */
 export class SearchFormService<
   T extends IDESearchForm = IDESearchForm,
-> extends ControlService<T> {
+> extends FormService<T> {
   /**
    * 执行获取草稿方法
    *
@@ -25,12 +26,16 @@ export class SearchFormService<
    * @returns {*}  {Promise<IHttpResponse>}
    */
   async getDraft(
-    _context: IParams,
+    context: IParams,
     params: IParams = {},
   ): Promise<IHttpResponse<ControlVO>> {
     const tempData = this.getFilteredData({ ...params });
     let res = { ok: true, status: 200, data: tempData } as IHttpResponse;
     res = this.handleResponse(res);
+    // 设置默认值
+    if (res.ok && res.data) {
+      this.setDefault(res.data, context, params, 'create');
+    }
     return res as IHttpResponse<ControlVO>;
   }