@ibiz-template/runtime 0.4.11 → 0.4.12

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

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

@@ -156,7 +156,7 @@ export class SearchBarController
     // 搜索过滤器
     const filters = this.calcFilters();
     if (filters) {
-      params.filters = filters;
+      params.searchconds = filters;
     }
     return params;
   }
@@ -218,7 +218,7 @@ export class SearchBarController
       }
     });
     if (hasFilter && !hasError) {
-      const filter = this.formatFilters(this.state.filterNodes[0]);
+      const filter = [this.formatFilters(this.state.filterNodes[0])];
       return filter;
     }
   }
@@ -233,15 +233,18 @@ export class SearchBarController
   formatFilters(node: IFilterNode): IData {
     if (!node.leaf) {
       return {
-        [`$${node.logicType.toLowerCase()}`]: node.children.map(item =>
-          this.formatFilters(item),
-        ),
+        condtype: 'GROUP',
+        condop: node.logicType,
+        bnotmode: false,
+        searchcondlist: node.children.map(item => this.formatFilters(item)),
       };
     }
+
     return {
-      [`${node.field}`]: {
-        [`$${node.valueOP!.toLowerCase()}`]: node.value,
-      },
+      condtype: 'DEFIELD',
+      fieldname: node.field,
+      condop: node.valueOP,
+      value: node.value,
     };
   }
 }

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/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/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/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/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/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/utils/de-cache/de-cache.ts

@@ -421,10 +421,10 @@ export class DECache {
     );
     const unionValues = unionKeys.map(key => {
       if (isNil(data[key])) {
-        throw new RuntimeError(`联合键值计算异常，${key}属性为空值！`);
+        return `__empty__`;
       }
       return data[key];
     });
-    data.srfkey = unionValues.join('');
+    data.srfkey = unionValues.join('||');
   }
 }

package/src/utils/layout-panel-util/layout-panel-util.ts

@@ -120,9 +120,24 @@ export class LayoutPanelUtil {
     } else if (mainMenuAlign) {
       exTag = mainMenuAlign.toUpperCase();
     }
+    // 计算面板标识
+    let key: string = '';
     if (exTag !== '') {
-      return `${viewType}_${viewStyle}_${exTag}`;
+      key = `${viewType}_${viewStyle}_${exTag}`;
+    } else {
+      key = `${viewType}_${viewStyle}`;
     }
-    return `${viewType}_${viewStyle}`;
+    // 首页不采用分页导航
+    if (
+      ibiz.config.view.noNavTabs &&
+      [
+        'APPINDEXVIEW_DEFAULT',
+        'APPINDEXVIEW_DEFAULT_LEFT',
+        'APPINDEXVIEW_DEFAULT_TOP',
+      ].includes(key)
+    ) {
+      key += '_NO_NAV';
+    }
+    return key;
   }
 }