@ibiz-template/runtime 0.4.11 → 0.4.13

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

@@ -70,6 +70,14 @@ export interface ITreeState extends IMDControlState {
  * @class ITreeNodeData
  */
 export interface ITreeNodeData {
+  /**
+   * 节点数据的唯一标识（创建的时候自动生成）
+   * @author lxm
+   * @date 2023-12-18 10:24:26
+   * @type {string}
+   */
+  _uuid: string;
+
   /**
    * 节点标识(对应节点模型的id)
    *

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/provider/i-grid-column.provider.ts

@@ -1,5 +1,5 @@
 import { IDEGridColumn } from '@ibiz/model-core';
-import { TreeGridExController } from '../../controller';
+import { GanttController, TreeGridExController } from '../../controller';
 import { IGridColumnController, IGridController } from '../controller';
 
 /**
@@ -32,7 +32,7 @@ export interface IGridColumnProvider {
    */
   createController(
     columnModel: IDEGridColumn,
-    grid: IGridController | TreeGridExController,
+    grid: IGridController | TreeGridExController | GanttController,
     // eslint-disable-next-line @typescript-eslint/no-explicit-any
   ): Promise<IGridColumnController>;
 }

package/src/interface/service/i-data-entity/i-data-entity.ts

@@ -48,6 +48,15 @@ export interface IDataEntity {
    */
   srfmajorfield: string;
 
+  /**
+   * 父对象主键
+   *
+   * @author chitanda
+   * @date 2023-12-18 10:12:50
+   * @type {string}
+   */
+  srfpkey?: string;
+
   /**
    * 实体主键值
    *

package/src/interface/service/service/i-app-de.service.ts

@@ -3,6 +3,7 @@ import { DECache } from '../../../service/utils';
 import { IFileService } from './i-file.service';
 import { IWorkFlowService } from './i-wf.service';
 import { IConfigService } from './i-config.service';
+import { IDataEntity } from '../i-data-entity/i-data-entity';
 
 /**
  * 实体服务
@@ -243,6 +244,17 @@ export interface IAppDEService {
     params2?: IParams,
   ): Promise<IHttpResponse>;
 
+  /**
+   * 查询临时数据本地缓存
+   *
+   * @author chitanda
+   * @date 2023-12-18 11:12:11
+   * @param {IParams} context
+   * @param {IParams} [params]
+   * @return {*}  {Promise<IDataEntity[]>}
+   */
+  selectLocal(context: IParams, params?: IParams): Promise<IDataEntity[]>;
+
   /**
    * 获取默认数据集[系统预置](临时数据)
    *

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/logic-scheduler/executor/app-ui-logic-executor.ts

@@ -32,13 +32,19 @@ export class AppUILogicExecutor extends LogicExecutor {
   async execute(executeParams: IUILogicParams): Promise<any> {
     let result;
     try {
-      if (this.logic.id === 'opendata' && this.logic.builtinAppUILogic) {
+      if (
+        this.logic.builtinAppUILogic &&
+        this.logic.builtinAppUILogic.viewLogicType === 'APP_OPENDATA'
+      ) {
         // 执行打开数据界面逻辑
         result = await this.executeOpenDataAppUILogic(
           this.logic.builtinAppUILogic as IAppUIOpenDataLogic,
           executeParams,
         );
-      } else if (this.logic.id === 'newdata' && this.logic.builtinAppUILogic) {
+      } else if (
+        this.logic.builtinAppUILogic &&
+        this.logic.builtinAppUILogic.viewLogicType === 'APP_NEWDATA'
+      ) {
         // 执行新建数据逻辑
         result = await this.executeNewDataAppUILogic(
           this.logic.builtinAppUILogic as IAppUINewDataLogic,

package/src/register/helper/grid-column-register.ts

@@ -1,4 +1,4 @@
-import { IDEGridColumn } from '@ibiz/model-core';
+import { IDEGridColumn, IDETreeColumn } from '@ibiz/model-core';
 import { IGridColumnProvider } from '../../interface';
 import { getPluginRegisterKey } from './common-register';
 
@@ -35,12 +35,14 @@ function getProvider(key: string): IGridColumnProvider | undefined {
  * @return {*}  {Promise<IGridColumnProvider>}
  */
 export async function getGridColumnProvider(
-  model: IDEGridColumn,
+  model: IDEGridColumn | IDETreeColumn,
 ): Promise<IGridColumnProvider | undefined> {
   let provider: IGridColumnProvider | undefined;
   const { columnType, enableRowEdit, sysPFPluginId, appId } =
     model as Required<IDEGridColumn>;
 
+  const { renderSysPFPluginId } = model as Required<IDETreeColumn>;
+
   // 找插件适配器
   if (sysPFPluginId) {
     const pluginKey = await getPluginRegisterKey(sysPFPluginId, appId);
@@ -54,6 +56,19 @@ export async function getGridColumnProvider(
     }
   }
 
+  // 树表格列插件
+  if (renderSysPFPluginId) {
+    const pluginKey = await getPluginRegisterKey(renderSysPFPluginId, appId);
+    if (pluginKey) {
+      provider = getProvider(pluginKey);
+    }
+    if (!provider) {
+      ibiz.log.error(`找不到树表格列插件${pluginKey}对应的适配器`);
+    } else {
+      return provider;
+    }
+  }
+
   const key = enableRowEdit ? `${columnType!}_EDIT` : columnType!;
   // 找表格列类型
   provider = getProvider(key);

package/src/service/dto/method.dto.ts

@@ -111,7 +111,9 @@ export class MethodDto {
             const service = await this.app!.deService.getService(
               field.refAppDataEntityId!,
             );
-            const items: IData[] = service.local.getList(context);
+            const items = await service.selectLocal(context, {
+              srfpkey: data[this.entity.keyAppDEFieldId!],
+            });
             if (items) {
               const arr = [];
               for (let j = 0; j < items.length; j++) {
@@ -163,6 +165,11 @@ export class MethodDto {
               const dto = await this.getFieldDto(field);
               const items: IData[] = datum[key];
               if (items) {
+                const pKey = datum[this.entity.keyAppDEFieldId!];
+                // 特殊处理，在子包内设置父对象标识
+                items.forEach(item => {
+                  item.srfpkey = pKey;
+                });
                 await dto.sets(context, items);
               } else {
                 await dto.sets(context, []);

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

@@ -5,12 +5,14 @@ import {
   ModelError,
   RuntimeError,
 } from '@ibiz-template/core';
+import { equals, isEmpty, where } from 'ramda';
+import { ascSort } from 'qx-util';
 import { DECache, calcResPath } from '../../utils';
 import { WorkFlowService } from '../work-flow/work-flow.service';
 import { Method } from './method/method';
 import { FileService } from '../file/file.service';
 import { findModelChild } from '../../../model';
-import { IAppDEService } from '../../../interface';
+import { IAppDEService, IDataEntity } from '../../../interface';
 import { ConfigService } from '../config/config.service';
 import { getDEMethodProvider } from '../../../register/helper/de-method-register';
 
@@ -237,6 +239,77 @@ export class DEService implements IAppDEService {
     return this.exec('FetchTempDefault', context, params, params2);
   }
 
+  /**
+   * 查询本地数据，根据属性
+   *
+   * @param {IParams} context
+   * @param {IParams} params 根据多实体属性查找，例：{ name: '张三', age: 18, parent: null }
+   * @return {*}  {Promise<IDataEntity[]>}
+   */
+  async selectLocal(
+    context: IParams,
+    params: IParams = {},
+  ): Promise<IDataEntity[]> {
+    let items: IDataEntity[] = this.local.getList(context);
+    items = ascSort(items, 'srfordervalue');
+    // 查询数据条件集
+    const data: IData = {};
+    // if (notNilEmpty(context)) {
+    //   const map = this.entity.majorKeyMap;
+    //   if (map) {
+    //     for (const key in map) {
+    //       if (Object.prototype.hasOwnProperty.call(map, key)) {
+    //         const val = map[key];
+    //         if (notNilEmpty(context[key])) {
+    //           data[val] = equals(context[key]);
+    //         }
+    //       }
+    //     }
+    //   }
+    // }
+    const nullData: Record<string, unknown> = {};
+    const undefinedData: Record<string, unknown> = {};
+    const emptyData: Record<string, unknown> = {};
+    if (params.srfkey) {
+      data.srfkey = equals(params.srfkey);
+      delete params.srfkey;
+    }
+    for (const key in params) {
+      if (Object.prototype.hasOwnProperty.call(params, key)) {
+        const val = params[key];
+        if (val == null) {
+          nullData[key] = equals(null);
+          undefinedData[key] = equals(undefined);
+          emptyData[key] = equals('');
+        } else {
+          data[key] = equals(val);
+        }
+      }
+    }
+    if (!isEmpty(data)) {
+      // 返回柯里化函数，用于判断数据是否满足要求
+      const pred = where(data);
+      const nullPred = where(nullData);
+      const undefinedPred = where(undefinedData);
+      const emptyPred = where(emptyData);
+      items = items.filter(obj => {
+        if (isEmpty(nullData)) {
+          if (pred(obj)) {
+            return true;
+          }
+        } else if (
+          pred(obj) &&
+          (nullPred(obj) || undefinedPred(obj) || emptyPred(obj))
+        ) {
+          return true;
+        }
+        return false;
+      });
+    }
+    const list = items.map(obj => obj.clone());
+    return list;
+  }
+
   /**
    * 执行服务方法 ac 模式
    *

package/src/service/service/entity/method/fetch.ts

@@ -3,10 +3,10 @@ import {
   ModelError,
   RuntimeModelError,
 } from '@ibiz-template/core';
-import { ascSort, descSort } from 'qx-util';
-import { clone, equals, isEmpty, isNil, where } from 'ramda';
 import { IAppDEDataSet } from '@ibiz/model-core';
 import { isArray } from 'lodash-es';
+import { clone, isEmpty, isNil } from 'ramda';
+import { ascSort, descSort } from 'qx-util';
 import { PSDEDQCondEngine, SearchFilter } from '../../../utils';
 import { Method } from './method';
 import { IDataEntity } from '../../../../interface';
@@ -85,88 +85,17 @@ export class FetchMethod extends Method {
     return res as HttpResponse<IDataEntity[]>;
   }
 
-  /**
-   * 查询本地数据，根据属性
-   *
-   * @param {IParams} context
-   * @param {IParams} params 根据多实体属性查找，例：{ name: '张三', age: 18, parent: null }
-   * @return {*}  {Promise<IDataEntity[]>}
-   */
-  protected async selectLocal(
-    context: IParams,
-    params: IParams = {},
-  ): Promise<IDataEntity[]> {
-    const service = await this.getService();
-    let items: IDataEntity[] = service.local.getList(context);
-    items = ascSort(items, 'srfordervalue');
-    // 查询数据条件集
-    const data: IData = {};
-    // if (notNilEmpty(context)) {
-    //   const map = this.entity.majorKeyMap;
-    //   if (map) {
-    //     for (const key in map) {
-    //       if (Object.prototype.hasOwnProperty.call(map, key)) {
-    //         const val = map[key];
-    //         if (notNilEmpty(context[key])) {
-    //           data[val] = equals(context[key]);
-    //         }
-    //       }
-    //     }
-    //   }
-    // }
-    const nullData: Record<string, unknown> = {};
-    const undefinedData: Record<string, unknown> = {};
-    const emptyData: Record<string, unknown> = {};
-    if (params.srfkey) {
-      data.srfkey = equals(params.srfkey);
-      delete params.srfkey;
-    }
-    for (const key in params) {
-      if (Object.prototype.hasOwnProperty.call(params, key)) {
-        const val = params[key];
-        if (val == null) {
-          nullData[key] = equals(null);
-          undefinedData[key] = equals(undefined);
-          emptyData[key] = equals('');
-        } else {
-          data[key] = equals(val);
-        }
-      }
-    }
-    if (!isEmpty(data)) {
-      // 返回柯里化函数，用于判断数据是否满足要求
-      const pred = where(data);
-      const nullPred = where(nullData);
-      const undefinedPred = where(undefinedData);
-      const emptyPred = where(emptyData);
-      items = items.filter(obj => {
-        if (isEmpty(nullData)) {
-          if (pred(obj)) {
-            return true;
-          }
-        } else if (
-          pred(obj) &&
-          (nullPred(obj) || undefinedPred(obj) || emptyPred(obj))
-        ) {
-          return true;
-        }
-        return false;
-      });
-    }
-    const list = items.map(obj => obj.clone());
-    return list;
-  }
-
   /**
    * 搜索本地数据
    *
-   * @protected
-   * @param {PSDEDQCondEngine | null} cond 查询实例
+   * @author chitanda
+   * @date 2023-12-18 11:12:27
+   * @param {(PSDEDQCondEngine | null)} cond 查询实例
    * @param {SearchFilter} filter 过滤对象
-   * @param {string[]} [queryParamKeys=this.entity.quickSearchKeys] 当前实体支持快速搜索的属性
+   * @param {string[]} [queryParamKeys=this.entity.quickSearchAppDEFieldIds!] 当前实体支持快速搜索的属性
    * @return {*}  {Promise<IDataEntity[]>}
    */
-  protected async searchLocal(
+  async searchLocal(
     cond: PSDEDQCondEngine | null,
     filter: SearchFilter,
     queryParamKeys: string[] = this.entity.quickSearchAppDEFieldIds!,
@@ -180,7 +109,7 @@ export class FetchMethod extends Method {
         list = list.filter(obj => cond.test(obj, filter));
       }
     } else {
-      list = await this.selectLocal(filter.context, filter.data);
+      list = await service.selectLocal(filter.context, filter.data);
       if (list.length > 0) {
         if (filter.query && filter.query !== '') {
           if (queryParamKeys) {

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/service/vo/gantt-node-data/gantt-code-list-node-data.ts

@@ -21,6 +21,8 @@ export class GanttCodeListNodeData
 
   children?: IGanttNodeData[] | undefined;
 
+  parent?: IGanttNodeData;
+
   constructor(
     model: IDEGantt,
     nodeModel: IDETreeDataSetNode,

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

@@ -1,7 +1,7 @@
 import { IDEGantt, IDETreeDataSetNode } from '@ibiz/model-core';
 import { IGanttNodeData } from '../../../interface';
 import { TreeDataSetNodeData } from '../tree-node-data';
-import { calcDataItemValue } from './gantt-node-data-util';
+import { calcDataItemValue, calcNodeDataItem } from './gantt-node-data-util';
 
 export class GanttDataSetNodeData
   extends TreeDataSetNodeData
@@ -21,6 +21,10 @@ export class GanttDataSetNodeData
 
   children?: IGanttNodeData[] | undefined;
 
+  parent?: IGanttNodeData;
+
+  nodeDataItem: IData;
+
   constructor(
     model: IDEGantt,
     nodeModel: IDETreeDataSetNode,
@@ -64,5 +68,6 @@ export class GanttDataSetNodeData
       nodeModel,
       data,
     );
+    this.nodeDataItem = calcNodeDataItem(nodeModel, data);
   }
 }

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

@@ -24,3 +24,24 @@ export const calcDataItemValue = (
   }
   return result;
 };
+
+/**
+ * 计算数据项
+ * @param nodeModel 节点模型
+ * @param data 数据
+ * @returns
+ */
+export const calcNodeDataItem = (
+  nodeModel: IDETreeNode,
+  data: IData,
+): IData => {
+  const dataItem: IData = {};
+  nodeModel.detreeNodeDataItems?.forEach(item => {
+    if (item.id && item.appDEFieldId) {
+      Object.assign(dataItem, {
+        [item.id.toLowerCase()]: data[item.appDEFieldId.toLowerCase()],
+      });
+    }
+  });
+  return dataItem;
+};

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

@@ -21,6 +21,8 @@ export class GanttStaticNodeData
 
   children?: IGanttNodeData[] | undefined;
 
+  parent?: IGanttNodeData;
+
   constructor(
     model: IDEGantt,
     nodeModel: IDETreeNode,

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

@@ -17,7 +17,7 @@ export class TreeCodeListNodeData
 {
   text: string;
 
-  id: string;
+  id!: string;
 
   value: string;
 
@@ -35,11 +35,16 @@ export class TreeCodeListNodeData
     const { data } = opts;
     this.text = data.text;
     this.value = data.value as string;
-    this.id = parentNodeData
-      ? `${parentNodeData.id}:${model.id}@${this.value}`
-      : model.id + this.value;
+
     // id小写
-    this.id = this.id.toLowerCase();
+    const selfId = `${model.id}@${this.value}`.toLowerCase();
+    Object.defineProperty(this, 'id', {
+      get() {
+        return this.parent ? `${this.parent.id}:${selfId}` : selfId;
+      },
+      enumerable: true,
+      configurable: true,
+    });
 
     // 实体节点额外添加上自己的实体上下文
     if (model.appDataEntityId) {

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

@@ -16,7 +16,7 @@ import { fieldValueToBoolean } from '../../utils';
 export class TreeDataSetNodeData extends TreeNodeData implements ITreeNodeData {
   text: string;
 
-  id: string;
+  id!: string;
 
   value: string;
 
@@ -41,11 +41,16 @@ export class TreeDataSetNodeData extends TreeNodeData implements ITreeNodeData {
     this.value = model.idAppDEFieldId
       ? data[model.idAppDEFieldId]
       : data.srfkey;
-    this.id = parentNodeData
-      ? `${parentNodeData.id}:${model.id}@${data.srfkey}`
-      : model.id + data.srfkey;
+
     // id小写
-    this.id = this.id.toLowerCase();
+    const selfId = `${model.id}@${data.srfkey}`.toLowerCase();
+    Object.defineProperty(this, 'id', {
+      get() {
+        return this.parent ? `${this.parent.id}:${selfId}` : selfId;
+      },
+      enumerable: true,
+      configurable: true,
+    });
 
     // 实体节点额外添加上自己的实体上下文
     if (model.appDataEntityId) {

package/src/service/vo/tree-node-data/tree-node-data.ts

@@ -1,4 +1,5 @@
 import { IDETreeNode } from '@ibiz/model-core';
+import { createUUID } from 'qx-util';
 import { IIcon, ITreeNodeData } from '../../../interface';
 
 /**
@@ -9,6 +10,8 @@ import { IIcon, ITreeNodeData } from '../../../interface';
  * @class TreeNodeData
  */
 export abstract class TreeNodeData implements ITreeNodeData {
+  _uuid: string = createUUID();
+
   id!: string;
 
   value?: string | undefined;

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

@@ -13,7 +13,7 @@ import { TreeNodeData } from './tree-node-data';
 export class TreeStaticNodeData extends TreeNodeData implements ITreeNodeData {
   text: string;
 
-  id: string;
+  id!: string;
 
   value?: string;
 
@@ -28,9 +28,16 @@ export class TreeStaticNodeData extends TreeNodeData implements ITreeNodeData {
     // !!根节点的默认节点值root排除掉
     const nodeValue = model.nodeValue === 'root' ? undefined : model.nodeValue;
 
-    this.id = parentNodeData ? `${parentNodeData.id}:${model.id}` : model.id!;
     // id小写
-    this.id = this.id.toLowerCase();
+    const selfId = `${model.id}`.toLowerCase();
+    Object.defineProperty(this, 'id', {
+      get() {
+        return this.parent ? `${this.parent.id}:${selfId}` : selfId;
+      },
+      enumerable: true,
+      configurable: true,
+    });
+
     this.text = model.text!;
     this.value = nodeValue;