@ibiz-template/runtime 0.5.3-beta.1 → 0.5.3-beta.11

package/src/service/utils/dynamic-code-list/dynamic-code-list.ts

@@ -133,6 +133,7 @@ export class DynamicCodeListCache {
    */
   protected convertData(data: IData): CodeListItem {
     const result = {} as CodeListItem;
+
     const {
       valueAppDEFieldId,
       textAppDEFieldId,
@@ -142,6 +143,8 @@ export class DynamicCodeListCache {
       iconPathXAppDEFieldId,
       disableAppDEFieldId,
       dataAppDEFieldId,
+      clsAppDEFieldId,
+      colorAppDEFieldId,
     } = this.codeList;
     // 值属性
     const value = valueAppDEFieldId ? data[valueAppDEFieldId] : data.srfkey;
@@ -177,6 +180,14 @@ export class DynamicCodeListCache {
     if (disableAppDEFieldId) {
       result.disableSelect = fieldValueToBoolean(data[disableAppDEFieldId]);
     }
+    // 样式表属性
+    if (clsAppDEFieldId) {
+      result.textCls = data[clsAppDEFieldId];
+    }
+    // 颜色值属性
+    if (colorAppDEFieldId) {
+      result.color = data[colorAppDEFieldId];
+    }
     // 数据属性
     if (dataAppDEFieldId && data[dataAppDEFieldId]) {
       try {
@@ -262,16 +273,16 @@ export class DynamicCodeListCache {
     );
     let resultItems: CodeListItem[] = [];
     if (res.data.length) {
-      res.data.forEach((item: IData) => {
-        if (pvalueAppDEFieldId) {
-          const tempItems = this.prepareTreeData(res.data as IData[]);
-          if (tempItems) {
-            resultItems = tempItems;
-          }
-        } else {
-          resultItems.push(this.convertData(item));
+      if (pvalueAppDEFieldId) {
+        const tempItems = this.prepareTreeData(res.data as IData[]);
+        if (tempItems) {
+          resultItems = tempItems;
         }
-      });
+      } else {
+        res.data.forEach((item: IData) => {
+          resultItems.push(this.convertData(item));
+        });
+      }
     }
     return Object.freeze(resultItems) as CodeListItem[];
   }
@@ -281,31 +292,23 @@ export class DynamicCodeListCache {
    *
    * @return {codeListItem[] | undefined}
    */
-  protected prepareTreeData(
-    items: IData[],
-    pValue?: string | number,
-  ): CodeListItem[] | undefined {
-    const { pvalueAppDEFieldId } = this.codeList;
-    let filteredData: IData[] = [];
-    filteredData = items.filter(item => {
-      if (pValue) {
-        // 有传父value去后台数据里找出来子项pValue等于父value的
-        return item[pvalueAppDEFieldId!] === pValue;
-      }
-      // 没有传父value，只需要找出来没有父值属性的
-      return !item[pvalueAppDEFieldId!];
+  protected prepareTreeData(items: IData[]): CodeListItem[] | undefined {
+    const { valueAppDEFieldId, pvalueAppDEFieldId } = this.codeList;
+    const map: { [id: string]: CodeListItem } = {};
+    const nestedList: CodeListItem[] = [];
+    items.forEach((data: IData) => {
+      map[data[valueAppDEFieldId as string]] = this.convertData(data);
     });
-    if (filteredData.length === 0) {
-      return;
-    }
-    return filteredData.map(data => {
-      const tempCodeListItem = this.convertData(data);
-      tempCodeListItem.children = this.prepareTreeData(
-        items,
-        tempCodeListItem.value,
-      );
-      return tempCodeListItem;
+    items.forEach((data: IData) => {
+      const parent = map[data[pvalueAppDEFieldId as string]];
+      if (parent) {
+        parent.children = parent.children || [];
+        parent.children.push(map[data[valueAppDEFieldId as string]]);
+      } else {
+        nestedList.push(map[data[valueAppDEFieldId as string]]);
+      }
     });
+    return nestedList;
   }
 
   /**

package/src/service/utils/res-path/res-path.ts

@@ -12,12 +12,12 @@ const reg = /\$\{(.*?)\}/g;
  * @author lxm
  * @date 2023-07-12 07:02:52
  * @export
- * @param {IContext} context
+ * @param {IParams} context
  * @param {IAppDataEntity} entity
  * @return {*}  {({ path: string; keys: string[] } | undefined)}
  */
 export function getMatchResPath(
-  context: IContext,
+  context: IParams,
   entity: IAppDataEntity,
 ): { path: string; keys: string[] } | undefined {
   const pathItems = entity.requestPaths || [];

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

@@ -1,13 +1,16 @@
 /* eslint-disable no-constructor-return */
 import { IDETreeDataSetNode, IDETreeNodeDataItem } from '@ibiz/model-core';
 import { updateKeyDefine } from '@ibiz-template/core';
-import { isNil } from 'ramda';
+import { clone, isNil } from 'ramda';
 import { IIcon, ITreeNodeData } from '../../../interface';
 import { calcDeCodeNameById } from '../../../model';
 import { ScriptFactory } from '../../../utils';
 import { TreeNodeData } from './tree-node-data';
 import { fieldValueToBoolean } from '../../utils';
 
+/** 克隆时赋值排除的字段 */
+const CloneExcludeKeys = ['_id', '_value', '_text', '_deData', 'clone'];
+
 /**
  * 实体数据集树节点数据
  *
@@ -17,13 +20,20 @@ import { fieldValueToBoolean } from '../../utils';
  * @implements {ITreeNodeData}
  */
 export class TreeDataSetNodeData extends TreeNodeData implements ITreeNodeData {
-  _text: string;
+  declare _text: string;
+
+  declare _id: string;
 
-  _id!: string;
+  declare _value: string;
 
-  _value: string;
+  declare _deData: IData;
 
-  _deData: IData;
+  /**
+   * 克隆方法
+   * @author lxm
+   * @date 2024-01-12 02:37:46
+   */
+  declare clone: () => TreeDataSetNodeData;
 
   constructor(
     model: IDETreeDataSetNode,
@@ -38,12 +48,6 @@ export class TreeDataSetNodeData extends TreeNodeData implements ITreeNodeData {
     super(model, parentNodeData, opts);
     const { data } = opts;
     this._deData = data;
-    this._text = model.textAppDEFieldId
-      ? data[model.textAppDEFieldId]
-      : data.srfmajortext;
-    this._value = model.idAppDEFieldId
-      ? data[model.idAppDEFieldId]
-      : data.srfkey;
 
     // id小写
     const selfId = `${model.id}@${data.srfkey}`.toLowerCase();
@@ -55,6 +59,26 @@ export class TreeDataSetNodeData extends TreeNodeData implements ITreeNodeData {
       configurable: true,
     });
 
+    // 文本值
+    Object.defineProperty(this, '_text', {
+      get() {
+        return model.textAppDEFieldId
+          ? data[model.textAppDEFieldId]
+          : data.srfmajortext;
+      },
+      enumerable: true,
+      configurable: true,
+    });
+
+    // value值
+    Object.defineProperty(this, '_value', {
+      get() {
+        return model.idAppDEFieldId ? data[model.idAppDEFieldId] : data.srfkey;
+      },
+      enumerable: true,
+      configurable: true,
+    });
+
     // 实体节点额外添加上自己的实体上下文
     if (model.appDataEntityId) {
       const deName = calcDeCodeNameById(model.appDataEntityId);
@@ -73,22 +97,21 @@ export class TreeDataSetNodeData extends TreeNodeData implements ITreeNodeData {
 
     /** 数据项和实体属性映射 */
     const dataItemKeyMap = new Map<string | symbol, string | symbol>();
-    dataItemKeyMap.set('srfkey', 'srfkey');
-    dataItemKeyMap.set('srfmajortext', 'srfmajortext');
-
+    const dataItemDefaultMap = new Map<string | symbol, unknown>();
     model.detreeNodeDataItems?.forEach(dataItem => {
-      const uiKey = dataItem.id!.toLowerCase();
-      // 后台实体属性
+      const dataItemKey = dataItem.id!.toLowerCase();
+
+      // *后台实体属性
       const deFieldKey = dataItem.appDEFieldId!.toLowerCase();
-      dataItemKeyMap.set(uiKey, deFieldKey);
+      dataItemKeyMap.set(dataItemKey, deFieldKey);
 
       // *设置默认值
-      if (dataItem.defaultValue && isNil(data[deFieldKey])) {
-        data[deFieldKey] = dataItem.defaultValue;
+      if (dataItem.defaultValue) {
+        dataItemDefaultMap.set(dataItemKey, dataItem.defaultValue);
       }
     });
 
-    /** 表格列和数据项的映射从而算出实体属性的映射 */
+    /** 表格列和数据项的映射 */
     const nodeColumnKeyMap = new Map<string | symbol, string | symbol>();
     model.detreeNodeColumns?.forEach(column => {
       const columnKey = column.detreeColumnId!; // 不配树表格列不会有这个模型
@@ -96,45 +119,87 @@ export class TreeDataSetNodeData extends TreeNodeData implements ITreeNodeData {
       if (!columnKey || !dataItemKey) {
         ibiz.log.error('模型异常缺少detreeColumnId或者dataItemName', column);
       } else {
-        nodeColumnKeyMap.set(columnKey, dataItemKeyMap.get(dataItemKey)!);
+        nodeColumnKeyMap.set(columnKey, dataItemKey);
       }
     });
 
+    /**
+     * 获取对应key最终映射的实体属性字段，undefined就是没有映射实体属性
+     * @author lxm
+     * @date 2024-01-12 01:48:09
+     * @param {(string | symbol)} key
+     * @return {*}  {(string | symbol | undefined)}
+     */
+    const getDeKey = (key: string | symbol): string | symbol | undefined => {
+      // 表格列映射的实体数据属性名称
+      if (nodeColumnKeyMap.has(key)) {
+        return dataItemKeyMap.get(nodeColumnKeyMap.get(key)!);
+      }
+      // 数据项映射的实体数据属性名称
+      if (dataItemKeyMap.has(key)) {
+        return dataItemKeyMap.get(key);
+      }
+      // 实体属性上可枚举的属性，返回该属性名称
+      if (Object.prototype.hasOwnProperty.call(this._deData, key)) {
+        return key;
+      }
+    };
+
+    /**
+     * 获取对应属性的默认值，纯显示用的
+     * @author lxm
+     * @date 2024-01-12 02:36:53
+     * @param {(string | symbol)} key
+     * @return {*}  {unknown}
+     */
+    const getKeyDefault = (key: string | symbol): unknown => {
+      // 表格列映射的数据项的默认值
+      if (nodeColumnKeyMap.has(key)) {
+        return dataItemDefaultMap.get(nodeColumnKeyMap.get(key)!);
+      }
+      // 数据项映射的默认值
+      if (dataItemDefaultMap.has(key)) {
+        return dataItemDefaultMap.get(key);
+      }
+    };
+
+    this.clone = (): TreeDataSetNodeData => {
+      const cloneData = clone(this._deData);
+      const cloneNodeData = new TreeDataSetNodeData(model, this._parent, {
+        data: cloneData,
+        leaf: this._leaf,
+        navContext: this._context,
+        navParams: this._params,
+      });
+      Object.keys(this).forEach(key => {
+        const deKey = getDeKey(key);
+        // 非实体的映射属性，且不是排除的属性时，从原来那边赋值过来
+        if (isNil(deKey) && !CloneExcludeKeys.includes(key)) {
+          (cloneNodeData as IData)[key] = (this as IData)[key];
+        }
+      });
+      return cloneNodeData;
+    };
+
     return new Proxy<TreeDataSetNodeData>(this, {
       set(target, p, value): boolean {
-        if (nodeColumnKeyMap.has(p)) {
-          // 通过树表格列标识设置
-          target._deData[nodeColumnKeyMap.get(p)!] = value;
-        } else if (dataItemKeyMap.has(p)) {
-          // 通过树节点数据项标识设置
-          target._deData[dataItemKeyMap.get(p)!] = value;
-        } else if (Object.prototype.hasOwnProperty.call(target._deData, p)) {
-          // 通过实体数据属性标识设置
-          target._deData[p] = value;
+        const deKey = getDeKey(p);
+        if (!isNil(deKey)) {
+          target._deData[deKey] = value;
         } else {
           (target as IData)[p] = value;
         }
         return true;
       },
-
       get(target, p, _receiver): unknown {
-        if ((target as IData)[p] !== undefined) {
-          return (target as IData)[p];
-        }
-        // 通过树表格列标识获取
-        if (nodeColumnKeyMap.has(p)) {
-          return target._deData[nodeColumnKeyMap.get(p)!];
-        }
-        // 通过树节点数据项标识获取
-        if (dataItemKeyMap.has(p)) {
-          return target._deData[dataItemKeyMap.get(p)!];
-        }
-        // 通过实体数据属性标识获取
-        if (target._deData[p] !== undefined) {
-          return target._deData[p];
+        const deKey = getDeKey(p);
+        if (!isNil(deKey)) {
+          return isNil(target._deData[deKey])
+            ? getKeyDefault(p)
+            : target._deData[deKey];
         }
+        return (target as IData)[p];
       },
-
       ownKeys(target): ArrayLike<string | symbol> {
         // 整合所有并排除重复
         const allKeys = [

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

@@ -86,6 +86,9 @@ export abstract class TreeNodeData implements ITreeNodeData {
       if (sysImage.imagePath) {
         icon.imagePath = sysImage.imagePath;
       }
+      if (sysImage.rawContent) {
+        icon.htmlStr = sysImage.rawContent;
+      }
     }
     return Object.values(icon).length > 0 ? icon : undefined;
   }

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

@@ -196,8 +196,15 @@ export class FrontUIActionProvider extends UIActionProviderBase {
    */
   protected async executeDataImport(
     action: IAppDEUIAction,
-    _args: IUILogicParams,
+    args: IUILogicParams,
   ): Promise<IUIActionResult> {
+    // 处理参数
+    const { resultContext, resultParams } = await this.handleParams(
+      action,
+      args.context,
+      args.data,
+      args.params,
+    );
     const appDataEntity = await ibiz.hub.getAppDataEntity(
       action.appDataEntityId!,
       action.appId,
@@ -216,6 +223,8 @@ export class FrontUIActionProvider extends UIActionProviderBase {
           dismiss: () => modal.dismiss(),
           appDataEntity,
           dataImport: appDEDataImport,
+          context: resultContext,
+          params: resultParams,
         },
         {
           width: 'auto',

package/src/ui-logic/ui-logic-node/debug-param-node/debug-param-node.ts

@@ -21,6 +21,6 @@ export class DebugParamNode extends UILogicNode {
       throw new RuntimeModelError(this.model, '缺少目标参数对象配置');
     }
     const param = ctx.params[dstDEUILogicParamId];
-    console.log(`逻辑节点${name}操作参数值:`, param);
+    ibiz.log.debug(`逻辑节点${name}操作参数值:`, param);
   }
 }

package/src/ui-logic/ui-logic-node/raw-js-code-node/raw-js-code-node.ts

@@ -7,7 +7,6 @@ export class RawJSCodeNode extends UILogicNode {
   declare model: IDEUIRawCodeLogic;
 
   async exec(ctx: UILogicContext): Promise<void> {
-    console.log(ctx);
     ScriptFactory.execScriptFn(
       {
         view: ctx.view,

package/src/utils/index.ts

@@ -18,4 +18,5 @@ export { ThemeUtil } from './theme-util/theme-util';
 export { UIDomain } from './ui-domain/ui-domain';
 export { UIDomainManager } from './ui-domain-manager/ui-domain-manager';
 export { RawValueUtil } from './raw-value-util/raw-value-util';
+export { ViewStack } from './view-stack/view-stack';
 export { handleAllSettled } from './promise/promise';

package/src/utils/script/script-function.ts

@@ -31,7 +31,7 @@ export class ScriptFunction {
       try {
         return fn.apply({}, args);
       } catch (error) {
-        console.log('报错脚本', code);
+        ibiz.log.error('报错脚本', code);
         throw error;
       }
     };

package/src/utils/ui-domain/transaction.ts

@@ -0,0 +1,100 @@
+import { ITransaction, ITransactionState } from '../../interface';
+
+/**
+ * 界面域下简单数据事务
+ *
+ * @author chitanda
+ * @date 2024-01-17 15:01:39
+ * @export
+ * @class Transaction
+ */
+export class Transaction implements ITransaction {
+  /**
+   * 待提交队列
+   *
+   * @author chitanda
+   * @date 2024-01-17 15:01:38
+   * @protected
+   */
+  protected commitQueue: Map<string, () => void> = new Map();
+
+  /**
+   * 事务状态
+   *
+   * @author chitanda
+   * @date 2024-01-17 15:01:45
+   * @type {ITransactionState}
+   */
+  readonly state: ITransactionState = {
+    isOpen: false,
+    isChange: false,
+  };
+
+  /**
+   * 开启事务
+   *
+   * @description 事务开启后，所有的数据操作都会被缓存，直到事务提交或者回滚
+   * @author chitanda
+   * @date 2024-01-17 15:01:46
+   */
+  open(): void {
+    if (this.state.isOpen) {
+      ibiz.log.warn('事务已经开启, 单个界面域只能开启一个事务');
+      return;
+    }
+    this.state.isOpen = true;
+  }
+
+  /**
+   * 新增变更事务回调，事务提交时会按照添加顺序倒序执行
+   *
+   * @author chitanda
+   * @date 2024-01-17 16:01:50
+   * @param {string} id 回调标识，用于去重。一个数据只能有一个回调
+   * @param {() => void} commit
+   */
+  change(id: string, commit: () => void): void {
+    this.state.isChange = true;
+    this.commitQueue.set(id, commit);
+  }
+
+  /**
+   * 提交事务
+   *
+   * @author chitanda
+   * @date 2024-01-17 15:01:05
+   */
+  commit(): void {
+    // 倒序提交
+    const commitQueue = Array.from(this.commitQueue.values()).reverse();
+    for (const commit of commitQueue) {
+      commit();
+    }
+    this.commitQueue.clear();
+    this.state.isChange = false;
+  }
+
+  /**
+   * 回滚事务
+   *
+   * @author chitanda
+   * @date 2024-01-17 19:01:43
+   */
+  rollback(): void {
+    this.commitQueue.clear();
+    this.state.isChange = false;
+  }
+
+  /**
+   * 关闭事务
+   *
+   * @author chitanda
+   * @date 2024-01-17 15:01:02
+   */
+  close(): void {
+    if (this.state.isChange) {
+      throw new Error('当前事务未提交，不可以直接关闭事务');
+    }
+    this.state.isOpen = false;
+  }
+}

package/src/utils/ui-domain/ui-domain.ts

@@ -1,5 +1,6 @@
 import { IAppDERS } from '@ibiz/model-core';
 import { createUUID } from 'qx-util';
+import { Transaction } from './transaction';
 
 /**
  * 界面域
@@ -20,15 +21,43 @@ export class UIDomain {
   readonly id: string;
 
   /**
-   * DTO 父子关系映射
+   * 状态
+   *
+   * @author chitanda
+   * @date 2024-01-15 19:01:51
+   * @type {{ rsInit: boolean }} 关系是否已经初始化
+   */
+  readonly state: { rsInit: boolean } = { rsInit: false };
+
+  /**
+   * DTO 子父关系映射
    *
    * @author chitanda
    * @date 2023-12-26 15:12:13
    * @protected
-   * @type {Map<string, IAppDERS[]>}
+   * @type {Map<string, IAppDERS[]>} Map<子实体, 当前实体的父关系>
    */
   protected rsMap: Map<string, IAppDERS[]> = new Map();
 
+  /**
+   * DTO 父子关系映射
+   *
+   * @author chitanda
+   * @date 2024-01-15 17:01:42
+   * @protected
+   * @type {Map<string, IAppDERS[]>}
+   */
+  protected rs2Map: Map<string, IAppDERS[]> = new Map();
+
+  /**
+   * 当前界面域下唯一事务
+   *
+   * @author chitanda
+   * @date 2024-01-17 15:01:07
+   * @type {Transaction}
+   */
+  readonly transaction: Transaction = new Transaction();
+
   /**
    * Creates an instance of UIDomain.
    *
@@ -50,11 +79,11 @@ export class UIDomain {
    *
    * @author chitanda
    * @date 2023-12-26 15:12:31
-   * @param {string} entity
+   * @param {string} appDataEntityId
    * @param {IAppDERS} configs
    */
-  setDERConfig(deCodeName: string, configs: IAppDERS[]): void {
-    this.rsMap.set(deCodeName, configs);
+  setDERConfig(appDataEntityId: string, configs: IAppDERS[]): void {
+    this.rsMap.set(appDataEntityId, configs);
   }
 
   /**
@@ -62,16 +91,51 @@ export class UIDomain {
    *
    * @author chitanda
    * @date 2023-12-26 16:12:07
-   * @param {string} deCodeName
+   * @param {string} appDataEntityId
+   * @return {*}  {IAppDERS[]}
+   */
+  getDERConfig(appDataEntityId: string): IAppDERS[] {
+    if (this.rsMap.has(appDataEntityId)) {
+      return this.rsMap.get(appDataEntityId)!;
+    }
+    return [];
+  }
+
+  /**
+   * 查询指定主实体下的所有子实体关系
+   *
+   * @author chitanda
+   * @date 2024-01-17 16:01:21
+   * @param {string} appDataEntityId
    * @return {*}  {IAppDERS[]}
    */
-  getDERConfig(deCodeName: string): IAppDERS[] {
-    if (this.rsMap.has(deCodeName)) {
-      return this.rsMap.get(deCodeName)!;
+  getDERConfigByMajor(appDataEntityId: string): IAppDERS[] {
+    if (this.rs2Map.has(appDataEntityId)) {
+      return this.rs2Map.get(appDataEntityId)!;
     }
     return [];
   }
 
+  /**
+   * 根据模型给的子实体中的父关系模型，计算每个实体的子关系模型
+   *
+   * @author chitanda
+   * @date 2024-01-15 19:01:49
+   */
+  calcParentRs(): void {
+    this.rs2Map.clear();
+    this.rsMap.forEach((configs, appDataEntityId) => {
+      configs.forEach(config => {
+        config.minorAppDataEntityId = appDataEntityId;
+        const major = config.majorAppDataEntityId!;
+        if (!this.rs2Map.has(major)) {
+          this.rs2Map.set(major, []);
+        }
+        this.rs2Map.get(major)!.push(config);
+      });
+    });
+  }
+
   /**
    * 界面域销毁
    *