@ibiz-template/runtime 0.5.3-beta.4 → 0.5.3-beta.5

package/out/service/vo/tree-node-data/tree-data-set-node-data.js

@@ -1,9 +1,11 @@
 import { updateKeyDefine } from '@ibiz-template/core';
-import { isNil } from 'ramda';
+import { clone, isNil } from 'ramda';
 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'];
 /**
  * 实体数据集树节点数据
  *
@@ -18,12 +20,6 @@ export class TreeDataSetNodeData extends TreeNodeData {
         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();
         Object.defineProperty(this, '_id', {
@@ -33,6 +29,24 @@ export class TreeDataSetNodeData extends TreeNodeData {
             enumerable: true,
             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);
@@ -48,19 +62,18 @@ export class TreeDataSetNodeData extends TreeNodeData {
         }
         /** 数据项和实体属性映射 */
         const dataItemKeyMap = new Map();
-        dataItemKeyMap.set('srfkey', 'srfkey');
-        dataItemKeyMap.set('srfmajortext', 'srfmajortext');
+        const dataItemDefaultMap = new Map();
         (_a = model.detreeNodeDataItems) === null || _a === void 0 ? void 0 : _a.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();
         (_b = model.detreeNodeColumns) === null || _b === void 0 ? void 0 : _b.forEach(column => {
             const columnKey = column.detreeColumnId; // 不配树表格列不会有这个模型
@@ -69,22 +82,69 @@ export class TreeDataSetNodeData extends TreeNodeData {
                 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) => {
+            // 表格列映射的实体数据属性名称
+            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) => {
+            // 表格列映射的数据项的默认值
+            if (nodeColumnKeyMap.has(key)) {
+                return dataItemDefaultMap.get(nodeColumnKeyMap.get(key));
+            }
+            // 数据项映射的默认值
+            if (dataItemDefaultMap.has(key)) {
+                return dataItemDefaultMap.get(key);
+            }
+        };
+        this.clone = () => {
+            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[key] = this[key];
+                }
+            });
+            return cloneNodeData;
+        };
         return new Proxy(this, {
             set(target, p, value) {
-                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[p] = value;
@@ -92,21 +152,13 @@ export class TreeDataSetNodeData extends TreeNodeData {
                 return true;
             },
             get(target, p, _receiver) {
-                if (target[p] !== undefined) {
-                    return target[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[p];
             },
             ownKeys(target) {
                 // 整合所有并排除重复

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@ibiz-template/runtime",
-  "version": "0.5.3-beta.4",
+  "version": "0.5.3-beta.5",
   "description": "控制器包",
   "type": "module",
   "main": "out/index.js",
@@ -30,7 +30,7 @@
   "license": "MIT",
   "devDependencies": {
     "@ibiz-template/core": "^0.5.2",
-    "@ibiz/model-core": "^0.1.2",
+    "@ibiz/model-core": "^0.1.3",
     "@types/path-browserify": "^1.0.2",
     "@types/qs": "^6.9.11",
     "@types/systemjs": "^6.13.5",
@@ -47,7 +47,7 @@
   },
   "peerDependencies": {
     "@ibiz-template/core": "^0.5.0-beta.0",
-    "@ibiz/model-core": "^0.1.2",
+    "@ibiz/model-core": "^0.1.3",
     "async-validator": "^4.2.5",
     "dayjs": "^1.11.7",
     "echarts": "^5.4.3",
@@ -59,5 +59,5 @@
     "qx-util": "^0.4.8",
     "ramda": "^0.29.0"
   },
-  "gitHead": "ed060fe1367c03eb252f52ac33a93ee7350733e3"
+  "gitHead": "5e76e5c131a8b28decd6af541137e756e2ca8c77"
 }

package/src/command/app/open-app-view/open-app-view.ts

@@ -73,9 +73,9 @@ export class OpenAppViewCommand {
     const { openMode = 'INDEXVIEWTAB' } = appView;
     const viewOpenMode = opts.openMode || openMode;
     if (viewOpenMode !== undefined && viewOpenMode !== 'INDEXVIEWTAB') {
-      // 除了走路由的，其他情况全删了toRouteDepth，避免影响后续操作
+      // 除了走路由的，其他情况toRouteDepth转为undefined，避免影响后续操作
       if (context.toRouteDepth) {
-        delete context.toRouteDepth;
+        context.toRouteDepth = undefined;
       }
     }
     switch (viewOpenMode) {

package/src/controller/constant/control/index.ts

@@ -1,3 +1,4 @@
 export * from './form/form-notify.state';
 export * from './grid/grid-notify.state';
 export * from './panel/panel-notify.state';
+export * from './tree-grid-ex/tree-grid-ex-notify.state';

package/src/controller/constant/control/tree-grid-ex/tree-grid-ex-notify.state.ts

@@ -0,0 +1,5 @@
+/* eslint-disable no-shadow */
+export enum TreeGridExNotifyState {
+  LOAD = 'LOAD',
+  SAVE = 'SAVE',
+}

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

@@ -1,5 +1,9 @@
 /* eslint-disable no-param-reassign */
-import { debounceAndAsyncMerge, recursiveIterate } from '@ibiz-template/core';
+import {
+  RuntimeModelError,
+  debounceAndAsyncMerge,
+  recursiveIterate,
+} from '@ibiz-template/core';
 import { IControlLogic, IDEForm, IDEFormDetail } from '@ibiz/model-core';
 import {
   IFormState,
@@ -177,6 +181,12 @@ export abstract class FormController<
         if (!detailProvider) {
           return;
         }
+        if (form.details[detail.id!]) {
+          throw new RuntimeModelError(
+            detail,
+            `初始化异常: 表单成员[${detail.id}](${detail.detailType})已存在，表单项标识重复请检查配置`,
+          );
+        }
         form.providers[detail.id!] = detailProvider;
         const detailController = await detailProvider.createController(
           detail,

package/src/controller/control/tree-grid-ex/tree-grid-ex-column/index.ts

@@ -1,3 +1,4 @@
 export { TreeGridExColumnController } from './tree-grid-ex-column/tree-grid-ex-column.controller';
 export { TreeGridExFieldColumnController } from './tree-grid-ex-field-column/tree-grid-ex-field-column.controller';
+export { TreeGridExNodeColumnController } from './tree-grid-ex-field-column/tree-grid-ex-node-column.controller';
 export { TreeGridExUAColumnController } from './tree-grid-ex-ua-column/tree-grid-ex-ua-column.controller';

package/src/controller/control/tree-grid-ex/tree-grid-ex-column/tree-grid-ex-column/tree-grid-ex-column.controller.ts

@@ -1,5 +1,7 @@
 import { IDETreeColumn } from '@ibiz/model-core';
 import { TreeGridExController } from '../../tree-grid-ex.controller';
+import { TreeGridExNotifyState } from '../../../../constant';
+import { TreeGridExRowState } from '../../tree-grid-ex-row.state';
 
 /**
  * 树表格（增强）列控制器
@@ -118,4 +120,24 @@ export class TreeGridExColumnController<
   protected async onInit(): Promise<void> {
     // 初始化操作
   }
+
+  /**
+   * 表格状态变更通知
+   *
+   * @author lxm
+   * @date 2022-09-20 18:09:07
+   */
+  gridStateNotify(
+    _row: TreeGridExRowState,
+    _state: TreeGridExNotifyState,
+  ): void {
+    // 子类实现具体逻辑
+  }
+
+  async dataChangeNotify(
+    _row: TreeGridExRowState,
+    _names: string[],
+  ): Promise<void> {
+    // 子类实现具体逻辑
+  }
 }

package/src/controller/control/tree-grid-ex/tree-grid-ex-column/tree-grid-ex-field-column/tree-grid-ex-field-column.controller.ts

@@ -1,6 +1,9 @@
 /* eslint-disable @typescript-eslint/no-unused-vars */
-import { IDETreeDEFColumn } from '@ibiz/model-core';
+import { IDETreeDEFColumn, IDETreeNodeColumn } from '@ibiz/model-core';
 import { TreeGridExColumnController } from '../tree-grid-ex-column/tree-grid-ex-column.controller';
+import { TreeGridExNodeColumnController } from './tree-grid-ex-node-column.controller';
+import { TreeGridExNotifyState } from '../../../../constant';
+import { ITreeGridExRowState } from '../../../../../interface';
 
 /**
  * 树表格（增强）属性列控制器
@@ -10,4 +13,87 @@ import { TreeGridExColumnController } from '../tree-grid-ex-column/tree-grid-ex-
  * @class TreeGridExFieldColumnController
  * @extends {TreeGridExColumnController<IDETreeDEFColumn>}
  */
-export class TreeGridExFieldColumnController extends TreeGridExColumnController<IDETreeDEFColumn> {}
+export class TreeGridExFieldColumnController extends TreeGridExColumnController<IDETreeDEFColumn> {
+  /**
+   * 树表格列标识（用于取数和各种比较判断）
+   * @author lxm
+   * @date 2024-01-09 11:33:37
+   * @readonly
+   * @type {string}
+   */
+  get name(): string {
+    return this.model.id!;
+  }
+
+  /**
+   * 该树表格列对应不同节点模型的节点列控制器
+   * @author lxm
+   * @date 2024-01-08 05:40:56
+   * @type {Map<string, IDETreeNodeColumn>}
+   */
+  nodeColumnControllerMap: Map<string, TreeGridExNodeColumnController> =
+    new Map();
+
+  async init(): Promise<void> {
+    await this.onInit();
+    await this.initNodeColumnController();
+  }
+
+  /**
+   * 解析模型并初始化相关属性
+   * @author lxm
+   * @date 2024-01-08 05:59:12
+   * @return {*}  {Promise<void>}
+   */
+  async initNodeColumnController(): Promise<void> {
+    this.treeGrid.model.detreeNodes?.forEach(node => {
+      if (node.treeNodeType !== 'DE') {
+        return;
+      }
+      const nodeColumn = node.detreeNodeColumns?.find(
+        (column: IDETreeNodeColumn) => {
+          return column.detreeColumnId === this.model.id;
+        },
+      );
+
+      // 没有指定树表格列的不创建
+      if (nodeColumn) {
+        this.nodeColumnControllerMap.set(
+          node.id!,
+          new TreeGridExNodeColumnController(this, node),
+        );
+      }
+    });
+
+    // 都走一遍初始化
+    await Promise.all(
+      Array.from(this.nodeColumnControllerMap.values()).map(controller =>
+        controller.init(),
+      ),
+    );
+  }
+
+  /**
+   * 初始化属性列界面行为组按钮状态
+   * @author lxm
+   * @date 2024-01-11 01:48:38
+   * @param {ITreeGridExRowState} row
+   */
+  initActionStates(row: ITreeGridExRowState): void {
+    const nodeColumn = this.nodeColumnControllerMap.get(row.data._nodeId);
+    if (nodeColumn) {
+      nodeColumn.initActionStates(row);
+    }
+  }
+
+  gridStateNotify(
+    row: ITreeGridExRowState,
+    state: TreeGridExNotifyState,
+  ): void {
+    super.gridStateNotify(row, state);
+    const nodeColumn = this.nodeColumnControllerMap.get(row.data._nodeId);
+    if (nodeColumn) {
+      nodeColumn.gridStateNotify(row, state);
+    }
+  }
+}