@ibiz-template/runtime 0.2.8 → 0.2.9

package/src/model/panel/panel-field.ts

@@ -0,0 +1,49 @@
+import {
+  IPanel,
+  IPanelContainer,
+  IPanelField,
+  IPanelItem,
+} from '@ibiz/model-core';
+import { isDataContainer } from './data-container';
+
+const ChildKeys = ['panelItems', 'panelTabPages', 'rootPanelItems'] as const;
+
+function _getAllPanelField(model: IData): IPanelField[] {
+  let childItems: IPanelItem[] = [];
+  for (const key of ChildKeys) {
+    if (model[key]) {
+      childItems = model[key];
+      break;
+    }
+  }
+  const fields: IPanelField[] = [];
+
+  if (childItems.length) {
+    // 过滤出当前层级的子里面的所有面板属性
+    fields.push(...childItems.filter(item => item.itemType === 'FIELD'));
+
+    // 递归遍历拿子里面的成员
+    childItems.forEach(item => {
+      // 如果是数据容器则不往下找
+      if (!isDataContainer(item)) {
+        fields.push(..._getAllPanelField(item));
+      }
+    });
+  }
+
+  return fields;
+}
+
+/**
+ * 获取所有子面板属性模型
+ * @author lxm
+ * @date 2023-11-01 04:45:44
+ * @export
+ * @param {(IPanel | IPanelContainer)} model
+ * @return {*}  {IPanelField[]}
+ */
+export function getAllPanelField(
+  model: IPanel | IPanelContainer,
+): IPanelField[] {
+  return _getAllPanelField(model);
+}

package/src/model/utils/util.ts

@@ -1,8 +1,10 @@
 import {
   IAppView,
   IAppViewRef,
+  IApplication,
   IControl,
   IModelObject,
+  ISysPFPlugin,
 } from '@ibiz/model-core';
 
 /**
@@ -106,3 +108,21 @@ export function parseUserParams(userParams: Record<string, string>): {
 
   return { navigateContexts, navigateParams, other };
 }
+
+/**
+ * 从应用里面获取插件配置参数
+ *
+ * @author chitanda
+ * @date 2023-11-01 17:11:28
+ * @export
+ * @param {IApplication} app
+ * @param {string} id
+ * @return {*}  {ISysPFPlugin}
+ */
+export function getPFPlugin(app: IApplication, id: string): ISysPFPlugin {
+  const plugin = app.appPFPluginRefs?.find(item => item.id === id);
+  if (!plugin) {
+    throw new Error(`未找到插件${id}`);
+  }
+  return plugin;
+}

package/src/register/helper/common-register.ts

@@ -18,7 +18,7 @@ export async function getPluginRegisterKey(
   );
 
   if (!plugin) {
-    ibiz.log.error(`找不到${pluginId}的插件模型`);
+    ibiz.log.error(`未匹配到插件[${pluginId}]模型`);
     return;
   }
 

package/src/register/helper/index.ts

@@ -1,9 +1,10 @@
+export * from './app-counter-register';
 export * from './control-register';
 export * from './editor-register';
 export * from './form-detail-register';
 export * from './grid-column-register';
 export * from './panel-item-register';
+export * from './portlet-register';
 export * from './ui-action-register';
+export * from './ui-logic-node-register';
 export * from './view-register';
-export * from './portlet-register';
-export * from './app-counter-register';

package/src/register/helper/ui-logic-node-register.ts

@@ -0,0 +1,52 @@
+import { IAppUIAction, IDEUIPFPluginLogic } from '@ibiz/model-core';
+import { RuntimeError } from '@ibiz-template/core';
+import { getPluginRegisterKey } from './common-register';
+import { IUILogicNodeProvider } from '../../interface';
+
+/** 界面逻辑节点适配器前缀 */
+export const UILOGINNODE_PROVIDER_PREFIX = 'UI_LOGIN_NODE';
+
+/**
+ * 注册界面逻辑节点适配器
+ *
+ * @author lxm
+ * @date 2023-05-06 09:14:16
+ * @export
+ * @param {string} key
+ * @param {() => IUILogicNodeProvider} callback 生成界面行为适配器的回调
+ */
+export function registerUILogicNodeProvider(
+  key: string,
+  callback: () => IUILogicNodeProvider,
+): void {
+  ibiz.register.register(`${UILOGINNODE_PROVIDER_PREFIX}_${key}`, callback);
+}
+
+/**
+ * 获取界面逻辑节点适配器
+ *
+ * @author chitanda
+ * @date 2023-11-01 17:11:43
+ * @export
+ * @param {IDEUIPFPluginLogic} model
+ * @return {*}  {Promise<IUILogicNodeProvider>}
+ */
+export async function getUILogicNodeProvider(
+  model: IDEUIPFPluginLogic,
+): Promise<IUILogicNodeProvider | undefined> {
+  let provider: IUILogicNodeProvider | undefined;
+  const { sysPFPluginId, appId } = model as Required<IAppUIAction>;
+
+  const pluginKey = await getPluginRegisterKey(sysPFPluginId, appId);
+  if (pluginKey) {
+    provider = ibiz.register.get(
+      `${UILOGINNODE_PROVIDER_PREFIX}_${pluginKey}`,
+    ) as IUILogicNodeProvider;
+    if (provider) {
+      return provider;
+    }
+    throw new RuntimeError(
+      `找不到界面逻辑前端插件节点，插件${pluginKey}对应的适配器`,
+    );
+  }
+}

package/src/service/service/entity/method/de-action.ts

@@ -61,8 +61,11 @@ export class DEActionMethod extends Method {
     data?: IData | IData[],
     params?: IParams,
   ): Promise<HttpResponse<IData>> {
-    // 实体逻辑处理
+    if (data) {
+      await execFieldLogics(this.entity, 'change', context, data, params);
+    }
 
+    // 实体逻辑处理
     if (this.method.actionType === 'DELOGIC') {
       const deLogic = findDELogic(this.method.appDELogicId!, this.entity);
       if (!deLogic) {

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

@@ -73,7 +73,13 @@ export class FetchMethod extends Method {
 
     // 计算属性逻辑,每条数据走一遍
     if (res.data) {
-      execFieldLogics(this.entity, 'compute', context, res.data, searchParams);
+      await execFieldLogics(
+        this.entity,
+        'compute',
+        context,
+        res.data,
+        searchParams,
+      );
     }
 
     return res as HttpResponse<IDataEntity[]>;

package/src/service/vo/index.ts

@@ -3,3 +3,4 @@ export * from './tree-node-data';
 export * from './ui-map-field';
 export * from './calendar-item-data';
 export * from './map-data';
+export * from './panel-data';

package/src/service/vo/panel-data/index.ts

@@ -0,0 +1 @@
+export { PanelData } from './panel-data';

package/src/service/vo/panel-data/panel-data.ts

@@ -0,0 +1,93 @@
+/* eslint-disable no-constructor-return */
+
+import { IPanelField } from '@ibiz/model-core';
+
+// 更新属性，缺的补充定义
+function updateKeyDefine(target: IParams, keys: string[]): void {
+  keys.forEach(key => {
+    if (!Object.prototype.hasOwnProperty.call(target, key)) {
+      Object.defineProperty(target, key, {
+        enumerable: true,
+        configurable: true,
+        writable: true,
+        value: undefined,
+      });
+    }
+  });
+}
+
+/**
+ * 面板数据
+ * @author lxm
+ * @date 2023-11-01 05:13:53
+ * @export
+ * @class PanelData
+ */
+export class PanelData {
+  // eslint-disable-next-line @typescript-eslint/no-explicit-any
+  [key: string | symbol]: any;
+
+  /**
+   * 父视图参数
+   * @author lxm
+   * @date 2023-10-27 04:08:59
+   * @protected
+   * @type {IParams}
+   */
+  protected declare _origin?: IParams;
+
+  constructor(fields: IPanelField[], origin: IParams) {
+    // 面板属性映射绑定项
+    const keyMap: Record<string, string | undefined> = {};
+    // 绑定项映射面板属性
+    const reverseKeyMap: Record<string, string> = {};
+
+    fields.forEach(field => {
+      keyMap[field.id!] = field.viewFieldName?.toLowerCase();
+      if (field.viewFieldName) {
+        reverseKeyMap[field.viewFieldName.toLowerCase()] = field.id!;
+      }
+    });
+
+    return new Proxy(this, {
+      set(target: PanelData, p: string, value: unknown): boolean {
+        if (Object.prototype.hasOwnProperty.call(keyMap, p)) {
+          if (keyMap[p]) {
+            // 有面板属性有绑定数据项修改原始对象
+            origin[keyMap[p]!] = value;
+          } else {
+            // 有面板属性没有绑定数据项的改自身
+            target[p] = value;
+          }
+        } else {
+          // 没有面板属性的直接修改原始对象，视图面板对象一开始就是空的，没有任何属性
+          origin[keyMap[p]!] = value;
+        }
+
+        return true;
+      },
+
+      get(target: PanelData, p: string, _receiver: unknown): unknown {
+        // 有映射拿原始对象
+        if (keyMap[p]) {
+          return origin[keyMap[p]!];
+        }
+
+        // 源对象的属性可以直接拿
+        if (Object.prototype.hasOwnProperty.call(origin, p)) {
+          return origin[p];
+        }
+
+        // 最后拿自身
+        return target[p];
+      },
+
+      ownKeys(target: PanelData): ArrayLike<string | symbol> {
+        // 只返回原始数据的键，自身的只是前端映射使用不需要在复制和后台传递时使用
+        const allKeys = Object.keys(origin);
+        updateKeyDefine(target, allKeys);
+        return allKeys;
+      },
+    });
+  }
+}

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

@@ -34,8 +34,12 @@ export class TreeDataSetNodeData extends TreeNodeData implements ITreeNodeData {
     super(model, parentNodeData, opts);
     const { data } = opts;
     this.deData = data;
-    this.text = data.srfmajortext;
-    this.value = data.srfkey;
+    this.text = model.textAppDEFieldId
+      ? data[model.textAppDEFieldId]
+      : data.srfmajortext;
+    this.value = model.idAppDEFieldId
+      ? data[model.idAppDEFieldId]
+      : data.srfkey;
     this.id = parentNodeData
       ? `${parentNodeData.id}:${model.id}@${data.srfkey}`
       : model.id + data.srfkey;

package/src/ui-logic/ui-logic-context.ts

@@ -1,4 +1,4 @@
-import { IUILogicParams } from '../interface';
+import { IUILogicContext, IUILogicParams } from '../interface';
 import { UILogicParam } from './ui-logic-param/ui-logic-param';
 
 /**
@@ -9,7 +9,7 @@ import { UILogicParam } from './ui-logic-param/ui-logic-param';
  * @export
  * @class UILogicContext
  */
-export class UILogicContext {
+export class UILogicContext implements IUILogicContext {
   /**
    * 上一次返回值
    * @author lxm
@@ -98,6 +98,7 @@ export class UILogicContext {
 
   /**
    * 重置实体逻辑参数
+   *
    * @author lxm
    * @date 2023-03-24 09:18:02
    * @param {string} name
@@ -108,6 +109,7 @@ export class UILogicContext {
 
   /**
    * 重新建立变量
+   *
    * @author lxm
    * @date 2023-03-24 09:20:24
    * @param {string} name
@@ -118,6 +120,7 @@ export class UILogicContext {
 
   /**
    * 设置上一次返回值
+   *
    * @author lxm
    * @date 2023-09-04 09:23:52
    * @param {unknown} value
@@ -128,6 +131,7 @@ export class UILogicContext {
 
   /**
    * 初始化上一次返回参数类型的逻辑参数
+   *
    * @author lxm
    * @date 2023-09-04 09:52:00
    * @param {string} tag
@@ -142,6 +146,7 @@ export class UILogicContext {
 
   /**
    * 是否是实体参数变量（即后台数据对象）
+   *
    * @author lxm
    * @date 2023-09-22 03:40:30
    * @param {string} paramId

package/src/ui-logic/ui-logic-node/index.ts

@@ -7,6 +7,7 @@ export { UILogicNode } from './ui-logic-node';
 export { ViewCtrlInvokeNode } from './view-ctrl-invoke-node/view-ctrl-invoke-node';
 export { BindParamNode } from './bind-param-node/bind-param-node';
 export { MsgBoxNode } from './msg-box-node/msg-box-node';
+export { PFPluginNode } from './pf-plugin-node/pf-plugin-node';
 export { DebugParamNode } from './debug-param-node/debug-param-node';
 export { ResetParamNode } from './reset-param-node/reset-param-node';
 export { CopyParamNode } from './copy-param-node/copy-param-node';

package/src/ui-logic/ui-logic-node/pf-plugin-node/pf-plugin-node.ts

@@ -0,0 +1,24 @@
+import { IDEUIPFPluginLogic } from '@ibiz/model-core';
+import { UILogicContext } from '../../ui-logic-context';
+import { UILogicNode } from '../ui-logic-node';
+import { getUILogicNodeProvider } from '../../../register';
+
+/**
+ * 前端插件节点
+ *
+ * @author chitanda
+ * @date 2023-11-01 18:11:55
+ * @export
+ * @class PFPluginNode
+ * @extends {UILogicNode}
+ */
+export class PFPluginNode extends UILogicNode {
+  declare model: IDEUIPFPluginLogic;
+
+  async exec(ctx: UILogicContext): Promise<void> {
+    const provider = await getUILogicNodeProvider(this.model);
+    if (provider) {
+      await provider.exec(this.model, ctx);
+    }
+  }
+}

package/src/ui-logic/ui-logic.ts

@@ -14,6 +14,7 @@ import {
   EndNode,
   ExecuteDELogicNode,
   MsgBoxNode,
+  PFPluginNode,
   PrepareJSParamNode,
   RenewParamNode,
   ResetParamNode,
@@ -124,6 +125,8 @@ export class UILogic {
           logicNode = new ExecuteDELogicNode(node);
           break;
         case 'PFPLUGIN': // 前端插件调用
+          logicNode = new PFPluginNode(node);
+          break;
         default:
           throw new ModelError(node, `未支持的逻辑节点类型: ${logicNodeType}`);
       }

package/out/interface/util/i-export-excel/i-export-excel.d.ts.map

@@ -1 +0,0 @@
-{"version":3,"file":"i-export-excel.d.ts","sourceRoot":"","sources":["../../../../src/interface/util/i-export-excel/i-export-excel.ts"],"names":[],"mappings":"AAAA;;;;;;GAMG;AACH,MAAM,WAAW,gBAAgB;IAC/B;;;;OAIG;IACH,iBAAiB,CAAC,IAAI,EAAE;QACtB,MAAM,EAAE,MAAM,EAAE,CAAC;QACjB,IAAI,EAAE,KAAK,EAAE,CAAC;QACd,QAAQ,EAAE,MAAM,CAAC;QACjB,SAAS,EAAE,OAAO,CAAC;KACpB,GAAG,IAAI,CAAC;CACV"}