@ibiz-template/runtime 0.2.8 → 0.2.10

package/out/logic-scheduler/executor/app-ui-logic-executor.js

@@ -12,7 +12,7 @@ var __rest = (this && this.__rest) || function (s, e) {
 import { ModelError, RuntimeError, RuntimeModelError, } from '@ibiz-template/core';
 import { notNilEmpty } from 'qx-util';
 import { OpenAppViewCommand } from '../../command';
-import { calcDeCodeNameById, getFormTypeFieldName } from '../../model';
+import { calcDeCodeNameById } from '../../model';
 import { convertNavData } from '../../utils';
 import { LogicExecutor } from './logic-executor';
 import { Srfuf } from '../../service';
@@ -37,16 +37,13 @@ export class AppUILogicExecutor extends LogicExecutor {
         }
     }
     /**
-     * 执行应用预置界面逻辑opendata
+     * 执行应用预置界面逻辑 opendata
      *
-     * @author lxm
-     * @date 2022-08-22 14:08:03
-     * @export
-     * @param {IPSAppUIOpenDataLogic} appUILogic 应用预置界面逻辑opendata模型对象
-     * @param {IContext} context 上下文参数
-     * @param {(IData | null)} data 数据集合
-     * @param {IParams} params 视图参数
-     * @param {IData} [opts] 额外参数，event是js原生事件
+     * @author chitanda
+     * @date 2023-11-02 11:11:36
+     * @param {IAppUIOpenDataLogic} appUILogic 应用预置界面逻辑 opendata 模型对象
+     * @param {IUILogicParams} parameters
+     * @return {*}  {Promise<IModalData>}
      */
     async executeOpenDataAppUILogic(appUILogic, parameters) {
         const { context, params } = parameters, rest = __rest(parameters, ["context", "params"]);
@@ -54,6 +51,7 @@ export class AppUILogicExecutor extends LogicExecutor {
         if (!(data === null || data === void 0 ? void 0 : data[0])) {
             throw new RuntimeError('opendata没有可操作数据！');
         }
+        // openDataAppViews 只有[索引实体]或[多表单实体]才会有值
         const openViewRefs = appUILogic.openDataAppViews;
         let openViewRef;
         if (openViewRefs) {
@@ -84,15 +82,15 @@ export class AppUILogicExecutor extends LogicExecutor {
         return ibiz.commands.execute(OpenAppViewCommand.TAG, openView, tempContext, tempParams, rest);
     }
     async calcOpenViewRef(appUILogic, parameters) {
-        const appDataEntityId = parameters.view.model.appDataEntityId;
-        // 表单类型属性
-        const formTypeName = await getFormTypeFieldName(appDataEntityId);
-        if (!formTypeName) {
-            throw new RuntimeModelError(appUILogic, `${appDataEntityId}实体缺少表单类型应用实体属性`);
+        const appDataEntity = await ibiz.hub.getAppDataEntity(parameters.view.model.appDataEntityId);
+        // [多表单实体] or [索引实体]类型属性
+        const typeFileName = appDataEntity.formTypeAppDEFieldId || appDataEntity.dataTypeAppDEFieldId;
+        if (!typeFileName) {
+            throw new RuntimeModelError(appUILogic, `${appDataEntity.codeName}[多表单实体] or [索引实体]缺少类型属性配置`);
         }
         const { data } = parameters;
         // 表单类型值
-        const formTypeValue = data[0][formTypeName];
+        const formTypeValue = data[0][typeFileName];
         if (!formTypeValue) {
             throw new RuntimeModelError(appUILogic, '数据源无表单类型应用实体属性值');
         }

package/out/model/data-entity/data-entity.d.ts

@@ -26,17 +26,6 @@ export declare function hasDeCodeName(params: IParams, entityId: string): boolea
  * @Date: 2023-05-31 10:26:24
  */
 export declare function getDeACMode(appDEACModeId: string, entityId: string, srfappid?: string): Promise<IAppDEACMode | undefined>;
-/**
- * 从实体里找到表单类型应用实体属性
- *
- * @author zk
- * @date 2023-09-07 05:09:41
- * @export
- * @param {string} entityId
- * @param {string} [srfappid]
- * @return {*}  {(Promise<string | undefined>)}
- */
-export declare function getFormTypeFieldName(entityId: string): Promise<string | undefined>;
 /**
  * 从实体里找到实体逻辑
  * @author lxm

package/out/model/data-entity/data-entity.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"data-entity.d.ts","sourceRoot":"","sources":["../../../src/model/data-entity/data-entity.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,cAAc,EACd,YAAY,EACZ,WAAW,EACX,QAAQ,EACT,MAAM,kBAAkB,CAAC;AAG1B;;;;;;;GAOG;AACH,wBAAgB,kBAAkB,CAAC,EAAE,EAAE,MAAM,GAAG,MAAM,CAGrD;AAED;;;;;;;;;GASG;AACH,wBAAgB,aAAa,CAAC,MAAM,EAAE,OAAO,EAAE,QAAQ,EAAE,MAAM,GAAG,OAAO,CAGxE;AAED;;;;;GAKG;AACH,wBAAsB,WAAW,CAC/B,aAAa,EAAE,MAAM,EACrB,QAAQ,EAAE,MAAM,EAChB,QAAQ,CAAC,EAAE,MAAM,GAChB,OAAO,CAAC,YAAY,GAAG,SAAS,CAAC,CAMnC;AAED;;;;;;;;;GASG;AACH,wBAAsB,oBAAoB,CACxC,QAAQ,EAAE,MAAM,GACf,OAAO,CAAC,MAAM,GAAG,SAAS,CAAC,CAG7B;AAED;;;;;;;;GAQG;AACH,wBAAgB,WAAW,CACzB,YAAY,EAAE,MAAM,EACpB,MAAM,EAAE,cAAc,GACrB,QAAQ,GAAG,SAAS,CAEtB;AAED;;;;;;;;GAQG;AACH,wBAAgB,iBAAiB,CAC/B,MAAM,EAAE,cAAc,EACtB,IAAI,EAAE,SAAS,GAAG,QAAQ,GAAG,SAAS,GACrC,QAAQ,EAAE,CAYZ;AAED;;;;;;;;GAQG;AACH,wBAAgB,aAAa,CAC3B,MAAM,EAAE,cAAc,EACtB,OAAO,EAAE,MAAM,GACd,WAAW,GAAG,SAAS,CAEzB"}
+{"version":3,"file":"data-entity.d.ts","sourceRoot":"","sources":["../../../src/model/data-entity/data-entity.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,cAAc,EACd,YAAY,EACZ,WAAW,EACX,QAAQ,EACT,MAAM,kBAAkB,CAAC;AAG1B;;;;;;;GAOG;AACH,wBAAgB,kBAAkB,CAAC,EAAE,EAAE,MAAM,GAAG,MAAM,CAGrD;AAED;;;;;;;;;GASG;AACH,wBAAgB,aAAa,CAAC,MAAM,EAAE,OAAO,EAAE,QAAQ,EAAE,MAAM,GAAG,OAAO,CAGxE;AAED;;;;;GAKG;AACH,wBAAsB,WAAW,CAC/B,aAAa,EAAE,MAAM,EACrB,QAAQ,EAAE,MAAM,EAChB,QAAQ,CAAC,EAAE,MAAM,GAChB,OAAO,CAAC,YAAY,GAAG,SAAS,CAAC,CAMnC;AAED;;;;;;;;GAQG;AACH,wBAAgB,WAAW,CACzB,YAAY,EAAE,MAAM,EACpB,MAAM,EAAE,cAAc,GACrB,QAAQ,GAAG,SAAS,CAEtB;AAED;;;;;;;;GAQG;AACH,wBAAgB,iBAAiB,CAC/B,MAAM,EAAE,cAAc,EACtB,IAAI,EAAE,SAAS,GAAG,QAAQ,GAAG,SAAS,GACrC,QAAQ,EAAE,CAYZ;AAED;;;;;;;;GAQG;AACH,wBAAgB,aAAa,CAC3B,MAAM,EAAE,cAAc,EACtB,OAAO,EAAE,MAAM,GACd,WAAW,GAAG,SAAS,CAEzB"}

package/out/model/data-entity/data-entity.js

@@ -39,20 +39,6 @@ export async function getDeACMode(appDEACModeId, entityId, srfappid) {
     });
     return deACMode;
 }
-/**
- * 从实体里找到表单类型应用实体属性
- *
- * @author zk
- * @date 2023-09-07 05:09:41
- * @export
- * @param {string} entityId
- * @param {string} [srfappid]
- * @return {*}  {(Promise<string | undefined>)}
- */
-export async function getFormTypeFieldName(entityId) {
-    const appDataEntity = await ibiz.hub.getAppDataEntity(entityId);
-    return appDataEntity.formTypeAppDEFieldId;
-}
 /**
  * 从实体里找到实体逻辑
  * @author lxm

package/out/model/panel/index.d.ts

@@ -1,2 +1,3 @@
 export * from './data-container';
+export * from './panel-field';
 //# sourceMappingURL=index.d.ts.map

package/out/model/panel/index.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../src/model/panel/index.ts"],"names":[],"mappings":"AAAA,cAAc,kBAAkB,CAAC"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../src/model/panel/index.ts"],"names":[],"mappings":"AAAA,cAAc,kBAAkB,CAAC;AACjC,cAAc,eAAe,CAAC"}

package/out/model/panel/index.js

@@ -1 +1,2 @@
 export * from './data-container';
+export * from './panel-field';

package/out/model/panel/panel-field.d.ts

@@ -0,0 +1,11 @@
+import { IPanel, IPanelContainer, IPanelField } from '@ibiz/model-core';
+/**
+ * 获取所有子面板属性模型
+ * @author lxm
+ * @date 2023-11-01 04:45:44
+ * @export
+ * @param {(IPanel | IPanelContainer)} model
+ * @return {*}  {IPanelField[]}
+ */
+export declare function getAllPanelField(model: IPanel | IPanelContainer): IPanelField[];
+//# sourceMappingURL=panel-field.d.ts.map

package/out/model/panel/panel-field.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"panel-field.d.ts","sourceRoot":"","sources":["../../../src/model/panel/panel-field.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,MAAM,EACN,eAAe,EACf,WAAW,EAEZ,MAAM,kBAAkB,CAAC;AA+B1B;;;;;;;GAOG;AACH,wBAAgB,gBAAgB,CAC9B,KAAK,EAAE,MAAM,GAAG,eAAe,GAC9B,WAAW,EAAE,CAEf"}

package/out/model/panel/panel-field.js

@@ -0,0 +1,35 @@
+import { isDataContainer } from './data-container';
+const ChildKeys = ['panelItems', 'panelTabPages', 'rootPanelItems'];
+function _getAllPanelField(model) {
+    let childItems = [];
+    for (const key of ChildKeys) {
+        if (model[key]) {
+            childItems = model[key];
+            break;
+        }
+    }
+    const fields = [];
+    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) {
+    return _getAllPanelField(model);
+}

package/out/model/utils/util.d.ts

@@ -1,4 +1,4 @@
-import { IAppView, IAppViewRef, IControl, IModelObject } from '@ibiz/model-core';
+import { IAppView, IAppViewRef, IApplication, IControl, IModelObject, ISysPFPlugin } from '@ibiz/model-core';
 /**
  * 在数据模型中查找对应 id 模型
  *
@@ -42,4 +42,15 @@ export declare function parseUserParams(userParams: Record<string, string>): {
     navigateParams: IParams;
     other: IParams;
 };
+/**
+ * 从应用里面获取插件配置参数
+ *
+ * @author chitanda
+ * @date 2023-11-01 17:11:28
+ * @export
+ * @param {IApplication} app
+ * @param {string} id
+ * @return {*}  {ISysPFPlugin}
+ */
+export declare function getPFPlugin(app: IApplication, id: string): ISysPFPlugin;
 //# sourceMappingURL=util.d.ts.map

package/out/model/utils/util.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"util.d.ts","sourceRoot":"","sources":["../../../src/model/utils/util.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,QAAQ,EACR,WAAW,EACX,QAAQ,EACR,YAAY,EACb,MAAM,kBAAkB,CAAC;AAE1B;;;;;;;;;GASG;AACH,wBAAgB,cAAc,CAC5B,MAAM,EAAE,YAAY,EAAE,EACtB,EAAE,EAAE,MAAM,GACT,YAAY,GAAG,IAAI,CAQrB;AAED;;;;;;;;GAQG;AACH,wBAAgB,UAAU,CAAC,IAAI,EAAE,QAAQ,EAAE,GAAG,EAAE,MAAM,GAAG,QAAQ,GAAG,SAAS,CAQ5E;AAED;;;;;;;;GAQG;AACH,wBAAgB,aAAa,CAC3B,IAAI,EAAE,QAAQ,EACd,GAAG,EAAE,MAAM,GACV,WAAW,GAAG,SAAS,CAQzB;AAED;;;;;;GAMG;AACH,wBAAgB,eAAe,CAAC,UAAU,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,GAAG;IACnE,gBAAgB,EAAE,OAAO,CAAC;IAC1B,cAAc,EAAE,OAAO,CAAC;IACxB,KAAK,EAAE,OAAO,CAAC;CAChB,CAyBA"}
+{"version":3,"file":"util.d.ts","sourceRoot":"","sources":["../../../src/model/utils/util.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,QAAQ,EACR,WAAW,EACX,YAAY,EACZ,QAAQ,EACR,YAAY,EACZ,YAAY,EACb,MAAM,kBAAkB,CAAC;AAE1B;;;;;;;;;GASG;AACH,wBAAgB,cAAc,CAC5B,MAAM,EAAE,YAAY,EAAE,EACtB,EAAE,EAAE,MAAM,GACT,YAAY,GAAG,IAAI,CAQrB;AAED;;;;;;;;GAQG;AACH,wBAAgB,UAAU,CAAC,IAAI,EAAE,QAAQ,EAAE,GAAG,EAAE,MAAM,GAAG,QAAQ,GAAG,SAAS,CAQ5E;AAED;;;;;;;;GAQG;AACH,wBAAgB,aAAa,CAC3B,IAAI,EAAE,QAAQ,EACd,GAAG,EAAE,MAAM,GACV,WAAW,GAAG,SAAS,CAQzB;AAED;;;;;;GAMG;AACH,wBAAgB,eAAe,CAAC,UAAU,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,GAAG;IACnE,gBAAgB,EAAE,OAAO,CAAC;IAC1B,cAAc,EAAE,OAAO,CAAC;IACxB,KAAK,EAAE,OAAO,CAAC;CAChB,CAyBA;AAED;;;;;;;;;GASG;AACH,wBAAgB,WAAW,CAAC,GAAG,EAAE,YAAY,EAAE,EAAE,EAAE,MAAM,GAAG,YAAY,CAMvE"}

package/out/model/utils/util.js

@@ -87,3 +87,21 @@ export function parseUserParams(userParams) {
     }
     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, id) {
+    var _a;
+    const plugin = (_a = app.appPFPluginRefs) === null || _a === void 0 ? void 0 : _a.find(item => item.id === id);
+    if (!plugin) {
+        throw new Error(`未找到插件${id}`);
+    }
+    return plugin;
+}

package/out/register/helper/common-register.js

@@ -12,7 +12,7 @@ export async function getPluginRegisterKey(pluginId, appId) {
     const app = ibiz.hub.getApp(appId);
     const plugin = (_a = app.model.appPFPluginRefs) === null || _a === void 0 ? void 0 : _a.find(item => item.pluginCode.toLowerCase() === pluginId);
     if (!plugin) {
-        ibiz.log.error(`找不到${pluginId}的插件模型`);
+        ibiz.log.error(`未匹配到插件[${pluginId}]模型`);
         return;
     }
     await ibiz.plugin.loadPlugin(plugin);

package/out/register/helper/index.d.ts

@@ -1,10 +1,11 @@
+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';
 //# sourceMappingURL=index.d.ts.map

package/out/register/helper/index.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../src/register/helper/index.ts"],"names":[],"mappings":"AAAA,cAAc,oBAAoB,CAAC;AACnC,cAAc,mBAAmB,CAAC;AAClC,cAAc,wBAAwB,CAAC;AACvC,cAAc,wBAAwB,CAAC;AACvC,cAAc,uBAAuB,CAAC;AACtC,cAAc,sBAAsB,CAAC;AACrC,cAAc,iBAAiB,CAAC;AAChC,cAAc,oBAAoB,CAAC;AACnC,cAAc,wBAAwB,CAAC"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../src/register/helper/index.ts"],"names":[],"mappings":"AAAA,cAAc,wBAAwB,CAAC;AACvC,cAAc,oBAAoB,CAAC;AACnC,cAAc,mBAAmB,CAAC;AAClC,cAAc,wBAAwB,CAAC;AACvC,cAAc,wBAAwB,CAAC;AACvC,cAAc,uBAAuB,CAAC;AACtC,cAAc,oBAAoB,CAAC;AACnC,cAAc,sBAAsB,CAAC;AACrC,cAAc,0BAA0B,CAAC;AACzC,cAAc,iBAAiB,CAAC"}

package/out/register/helper/index.js

@@ -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/out/register/helper/ui-logic-node-register.d.ts

@@ -0,0 +1,25 @@
+import { IDEUIPFPluginLogic } from '@ibiz/model-core';
+import { IUILogicNodeProvider } from '../../interface';
+/** 界面逻辑节点适配器前缀 */
+export declare const UILOGINNODE_PROVIDER_PREFIX = "UI_LOGIN_NODE";
+/**
+ * 注册界面逻辑节点适配器
+ *
+ * @author lxm
+ * @date 2023-05-06 09:14:16
+ * @export
+ * @param {string} key
+ * @param {() => IUILogicNodeProvider} callback 生成界面行为适配器的回调
+ */
+export declare function registerUILogicNodeProvider(key: string, callback: () => IUILogicNodeProvider): void;
+/**
+ * 获取界面逻辑节点适配器
+ *
+ * @author chitanda
+ * @date 2023-11-01 17:11:43
+ * @export
+ * @param {IDEUIPFPluginLogic} model
+ * @return {*}  {Promise<IUILogicNodeProvider>}
+ */
+export declare function getUILogicNodeProvider(model: IDEUIPFPluginLogic): Promise<IUILogicNodeProvider | undefined>;
+//# sourceMappingURL=ui-logic-node-register.d.ts.map

package/out/register/helper/ui-logic-node-register.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"ui-logic-node-register.d.ts","sourceRoot":"","sources":["../../../src/register/helper/ui-logic-node-register.ts"],"names":[],"mappings":"AAAA,OAAO,EAAgB,kBAAkB,EAAE,MAAM,kBAAkB,CAAC;AAGpE,OAAO,EAAE,oBAAoB,EAAE,MAAM,iBAAiB,CAAC;AAEvD,kBAAkB;AAClB,eAAO,MAAM,2BAA2B,kBAAkB,CAAC;AAE3D;;;;;;;;GAQG;AACH,wBAAgB,2BAA2B,CACzC,GAAG,EAAE,MAAM,EACX,QAAQ,EAAE,MAAM,oBAAoB,GACnC,IAAI,CAEN;AAED;;;;;;;;GAQG;AACH,wBAAsB,sBAAsB,CAC1C,KAAK,EAAE,kBAAkB,GACxB,OAAO,CAAC,oBAAoB,GAAG,SAAS,CAAC,CAgB3C"}

package/out/register/helper/ui-logic-node-register.js

@@ -0,0 +1,37 @@
+import { RuntimeError } from '@ibiz-template/core';
+import { getPluginRegisterKey } from './common-register';
+/** 界面逻辑节点适配器前缀 */
+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, callback) {
+    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) {
+    let provider;
+    const { sysPFPluginId, appId } = model;
+    const pluginKey = await getPluginRegisterKey(sysPFPluginId, appId);
+    if (pluginKey) {
+        provider = ibiz.register.get(`${UILOGINNODE_PROVIDER_PREFIX}_${pluginKey}`);
+        if (provider) {
+            return provider;
+        }
+        throw new RuntimeError(`找不到界面逻辑前端插件节点，插件${pluginKey}对应的适配器`);
+    }
+}

package/out/service/service/entity/method/de-action.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"de-action.d.ts","sourceRoot":"","sources":["../../../../../src/service/service/entity/method/de-action.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,YAAY,EACZ,aAAa,EAGd,MAAM,qBAAqB,CAAC;AAC7B,OAAO,EAAE,YAAY,EAAE,MAAM,kBAAkB,CAAC;AAEhD,OAAO,EAAE,MAAM,EAAE,MAAM,UAAU,CAAC;AAClC,OAAO,EAAE,WAAW,EAAE,MAAM,uBAAuB,CAAC;AAKpD;;;;;;;;GAQG;AACH,qBAAa,cAAe,SAAQ,MAAM;IAChC,MAAM,EAAE,YAAY,CAAC;IAE7B;;;;;;;;OAQG;IACH,SAAS,KAAK,WAAW,IAAI,OAAO,CAEnC;IAED;;;;;;;OAOG;IACG,WAAW,CACf,OAAO,EAAE,OAAO,EAChB,IAAI,EAAE,KAAK,GAAG,KAAK,EAAE,GACpB,OAAO,CAAC,KAAK,GAAG,KAAK,EAAE,CAAC;IAQrB,IAAI,CACR,OAAO,EAAE,OAAO,EAChB,IAAI,CAAC,EAAE,KAAK,GAAG,KAAK,EAAE,EACtB,MAAM,CAAC,EAAE,OAAO,GACf,OAAO,CAAC,YAAY,CAAC,KAAK,CAAC,CAAC;IAmF/B;;;;;;;;OAQG;IACG,MAAM,CACV,OAAO,EAAE,OAAO,EAChB,IAAI,CAAC,EAAE,KAAK,GAAG,KAAK,EAAE,EACtB,MAAM,CAAC,EAAE,OAAO,GACf,OAAO,CAAC,aAAa,CAAC,WAAW,CAAC,CAAC;IAatC;;;;;;;;OAQG;IACG,MAAM,CACV,OAAO,EAAE,OAAO,EAChB,MAAM,CAAC,EAAE,OAAO,GACf,OAAO,CAAC,aAAa,CAAC,WAAW,CAAC,CAAC;IAYtC;;;;;;;;;OASG;IACG,MAAM,CACV,OAAO,EAAE,OAAO,EAChB,IAAI,CAAC,EAAE,KAAK,GAAG,KAAK,EAAE,EACtB,MAAM,CAAC,EAAE,OAAO,GACf,OAAO,CAAC,aAAa,CAAC,WAAW,CAAC,CAAC;IAiBtC;;;;;;;;OAQG;IACG,GAAG,CACP,OAAO,EAAE,OAAO,EAChB,MAAM,GAAE,OAAY,GACnB,OAAO,CAAC,aAAa,CAAC,WAAW,CAAC,CAAC;IAatC;;;;;;;;OAQG;IACG,QAAQ,CACZ,OAAO,EAAE,OAAO,EAChB,MAAM,CAAC,EAAE,OAAO,GACf,OAAO,CAAC,aAAa,CAAC,KAAK,CAAC,CAAC;IAUhC;;;;;;;;OAQG;IACG,UAAU,CACd,OAAO,EAAE,OAAO,EAChB,MAAM,EAAE,KAAK,GAAG,KAAK,EAAE,GACtB,OAAO,CAAC,aAAa,CAAC,WAAW,CAAC,CAAC;IAkBtC;;;;;;;;OAQG;IACG,YAAY,CAChB,QAAQ,EAAE,OAAO,EACjB,OAAO,CAAC,EAAE,OAAO,GAChB,OAAO,CAAC,aAAa,CAAC,WAAW,CAAC,CAAC;IAatC;;;;;;;;OAQG;IACG,UAAU,CACd,OAAO,EAAE,OAAO,EAChB,MAAM,CAAC,EAAE,OAAO,GACf,OAAO,CAAC,aAAa,CAAC,WAAW,CAAC,CAAC;IAoBtC;;;;;;;;OAQG;IACG,UAAU,CACd,OAAO,EAAE,OAAO,EAChB,MAAM,EAAE,KAAK,GAAG,KAAK,EAAE,GACtB,OAAO,CAAC,aAAa,CAAC,WAAW,CAAC,CAAC;IAqBtC;;;;;;;;OAQG;IACG,OAAO,CACX,OAAO,EAAE,OAAO,EAChB,MAAM,CAAC,EAAE,OAAO,GACf,OAAO,CAAC,aAAa,CAAC,WAAW,CAAC,CAAC;IAqBtC;;;;;;OAMG;IACG,eAAe,CACnB,QAAQ,EAAE,OAAO,EACjB,OAAO,CAAC,EAAE,OAAO,GAChB,OAAO,CAAC,aAAa,CAAC;CAc1B"}
+{"version":3,"file":"de-action.d.ts","sourceRoot":"","sources":["../../../../../src/service/service/entity/method/de-action.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,YAAY,EACZ,aAAa,EAGd,MAAM,qBAAqB,CAAC;AAC7B,OAAO,EAAE,YAAY,EAAE,MAAM,kBAAkB,CAAC;AAEhD,OAAO,EAAE,MAAM,EAAE,MAAM,UAAU,CAAC;AAClC,OAAO,EAAE,WAAW,EAAE,MAAM,uBAAuB,CAAC;AAKpD;;;;;;;;GAQG;AACH,qBAAa,cAAe,SAAQ,MAAM;IAChC,MAAM,EAAE,YAAY,CAAC;IAE7B;;;;;;;;OAQG;IACH,SAAS,KAAK,WAAW,IAAI,OAAO,CAEnC;IAED;;;;;;;OAOG;IACG,WAAW,CACf,OAAO,EAAE,OAAO,EAChB,IAAI,EAAE,KAAK,GAAG,KAAK,EAAE,GACpB,OAAO,CAAC,KAAK,GAAG,KAAK,EAAE,CAAC;IAQrB,IAAI,CACR,OAAO,EAAE,OAAO,EAChB,IAAI,CAAC,EAAE,KAAK,GAAG,KAAK,EAAE,EACtB,MAAM,CAAC,EAAE,OAAO,GACf,OAAO,CAAC,YAAY,CAAC,KAAK,CAAC,CAAC;IAsF/B;;;;;;;;OAQG;IACG,MAAM,CACV,OAAO,EAAE,OAAO,EAChB,IAAI,CAAC,EAAE,KAAK,GAAG,KAAK,EAAE,EACtB,MAAM,CAAC,EAAE,OAAO,GACf,OAAO,CAAC,aAAa,CAAC,WAAW,CAAC,CAAC;IAatC;;;;;;;;OAQG;IACG,MAAM,CACV,OAAO,EAAE,OAAO,EAChB,MAAM,CAAC,EAAE,OAAO,GACf,OAAO,CAAC,aAAa,CAAC,WAAW,CAAC,CAAC;IAYtC;;;;;;;;;OASG;IACG,MAAM,CACV,OAAO,EAAE,OAAO,EAChB,IAAI,CAAC,EAAE,KAAK,GAAG,KAAK,EAAE,EACtB,MAAM,CAAC,EAAE,OAAO,GACf,OAAO,CAAC,aAAa,CAAC,WAAW,CAAC,CAAC;IAiBtC;;;;;;;;OAQG;IACG,GAAG,CACP,OAAO,EAAE,OAAO,EAChB,MAAM,GAAE,OAAY,GACnB,OAAO,CAAC,aAAa,CAAC,WAAW,CAAC,CAAC;IAatC;;;;;;;;OAQG;IACG,QAAQ,CACZ,OAAO,EAAE,OAAO,EAChB,MAAM,CAAC,EAAE,OAAO,GACf,OAAO,CAAC,aAAa,CAAC,KAAK,CAAC,CAAC;IAUhC;;;;;;;;OAQG;IACG,UAAU,CACd,OAAO,EAAE,OAAO,EAChB,MAAM,EAAE,KAAK,GAAG,KAAK,EAAE,GACtB,OAAO,CAAC,aAAa,CAAC,WAAW,CAAC,CAAC;IAkBtC;;;;;;;;OAQG;IACG,YAAY,CAChB,QAAQ,EAAE,OAAO,EACjB,OAAO,CAAC,EAAE,OAAO,GAChB,OAAO,CAAC,aAAa,CAAC,WAAW,CAAC,CAAC;IAatC;;;;;;;;OAQG;IACG,UAAU,CACd,OAAO,EAAE,OAAO,EAChB,MAAM,CAAC,EAAE,OAAO,GACf,OAAO,CAAC,aAAa,CAAC,WAAW,CAAC,CAAC;IAoBtC;;;;;;;;OAQG;IACG,UAAU,CACd,OAAO,EAAE,OAAO,EAChB,MAAM,EAAE,KAAK,GAAG,KAAK,EAAE,GACtB,OAAO,CAAC,aAAa,CAAC,WAAW,CAAC,CAAC;IAqBtC;;;;;;;;OAQG;IACG,OAAO,CACX,OAAO,EAAE,OAAO,EAChB,MAAM,CAAC,EAAE,OAAO,GACf,OAAO,CAAC,aAAa,CAAC,WAAW,CAAC,CAAC;IAqBtC;;;;;;OAMG;IACG,eAAe,CACnB,QAAQ,EAAE,OAAO,EACjB,OAAO,CAAC,EAAE,OAAO,GAChB,OAAO,CAAC,aAAa,CAAC;CAc1B"}

package/out/service/service/entity/method/de-action.js

@@ -42,6 +42,9 @@ export class DEActionMethod extends Method {
         return this.input.handle(context, data);
     }
     async exec(context, data, params) {
+        if (data) {
+            await execFieldLogics(this.entity, 'change', context, data, params);
+        }
         // 实体逻辑处理
         if (this.method.actionType === 'DELOGIC') {
             const deLogic = findDELogic(this.method.appDELogicId, this.entity);

package/out/service/service/entity/method/fetch.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"fetch.d.ts","sourceRoot":"","sources":["../../../../../src/service/service/entity/method/fetch.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,YAAY,EAGb,MAAM,qBAAqB,CAAC;AAG7B,OAAO,EAAE,aAAa,EAAE,MAAM,kBAAkB,CAAC;AAEjD,OAAO,EAAE,gBAAgB,EAAE,YAAY,EAAE,MAAM,gBAAgB,CAAC;AAChE,OAAO,EAAE,MAAM,EAAE,MAAM,UAAU,CAAC;AAClC,OAAO,EAAE,WAAW,EAAE,MAAM,uBAAuB,CAAC;AAIpD;;;;;;;;GAQG;AACH,qBAAa,WAAY,SAAQ,MAAM;IAC7B,MAAM,EAAE,aAAa,CAAC;IAE9B,SAAS,KAAK,WAAW,IAAI,OAAO,CAEnC;IAEK,IAAI,CACR,OAAO,EAAE,OAAO,EAChB,MAAM,CAAC,EAAE,KAAK,GAAG,KAAK,EAAE,EACxB,OAAO,CAAC,EAAE,OAAO,GAChB,OAAO,CAAC,YAAY,CAAC,WAAW,EAAE,CAAC,CAAC;IA8CvC;;;;;;OAMG;cACa,WAAW,CACzB,OAAO,EAAE,OAAO,EAChB,MAAM,GAAE,OAAY,GACnB,OAAO,CAAC,WAAW,EAAE,CAAC;IA8DzB;;;;;;;;OAQG;cACa,WAAW,CACzB,IAAI,EAAE,gBAAgB,GAAG,IAAI,EAC7B,MAAM,EAAE,YAAY,EACpB,cAAc,GAAE,MAAM,EAA0C,GAC/D,OAAO,CAAC,WAAW,EAAE,CAAC;IA6CzB;;;;;;;OAOG;cACa,gBAAgB,CAC9B,OAAO,EAAE,OAAO,EAChB,MAAM,EAAE,OAAO,GACd,OAAO,CAAC,YAAY,CAAC,KAAK,EAAE,CAAC,CAAC;CAkBlC"}
+{"version":3,"file":"fetch.d.ts","sourceRoot":"","sources":["../../../../../src/service/service/entity/method/fetch.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,YAAY,EAGb,MAAM,qBAAqB,CAAC;AAG7B,OAAO,EAAE,aAAa,EAAE,MAAM,kBAAkB,CAAC;AAEjD,OAAO,EAAE,gBAAgB,EAAE,YAAY,EAAE,MAAM,gBAAgB,CAAC;AAChE,OAAO,EAAE,MAAM,EAAE,MAAM,UAAU,CAAC;AAClC,OAAO,EAAE,WAAW,EAAE,MAAM,uBAAuB,CAAC;AAIpD;;;;;;;;GAQG;AACH,qBAAa,WAAY,SAAQ,MAAM;IAC7B,MAAM,EAAE,aAAa,CAAC;IAE9B,SAAS,KAAK,WAAW,IAAI,OAAO,CAEnC;IAEK,IAAI,CACR,OAAO,EAAE,OAAO,EAChB,MAAM,CAAC,EAAE,KAAK,GAAG,KAAK,EAAE,EACxB,OAAO,CAAC,EAAE,OAAO,GAChB,OAAO,CAAC,YAAY,CAAC,WAAW,EAAE,CAAC,CAAC;IAoDvC;;;;;;OAMG;cACa,WAAW,CACzB,OAAO,EAAE,OAAO,EAChB,MAAM,GAAE,OAAY,GACnB,OAAO,CAAC,WAAW,EAAE,CAAC;IA8DzB;;;;;;;;OAQG;cACa,WAAW,CACzB,IAAI,EAAE,gBAAgB,GAAG,IAAI,EAC7B,MAAM,EAAE,YAAY,EACpB,cAAc,GAAE,MAAM,EAA0C,GAC/D,OAAO,CAAC,WAAW,EAAE,CAAC;IA6CzB;;;;;;;OAOG;cACa,gBAAgB,CAC9B,OAAO,EAAE,OAAO,EAChB,MAAM,EAAE,OAAO,GACd,OAAO,CAAC,YAAY,CAAC,KAAK,EAAE,CAAC,CAAC;CAkBlC"}

package/out/service/service/entity/method/fetch.js

@@ -49,7 +49,7 @@ export class FetchMethod extends Method {
         res.data = items.map(item => this.createEntity(item));
         // 计算属性逻辑,每条数据走一遍
         if (res.data) {
-            execFieldLogics(this.entity, 'compute', context, res.data, searchParams);
+            await execFieldLogics(this.entity, 'compute', context, res.data, searchParams);
         }
         return res;
     }

package/out/service/vo/index.d.ts

@@ -3,4 +3,5 @@ export * from './tree-node-data';
 export * from './ui-map-field';
 export * from './calendar-item-data';
 export * from './map-data';
+export * from './panel-data';
 //# sourceMappingURL=index.d.ts.map

package/out/service/vo/index.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../src/service/vo/index.ts"],"names":[],"mappings":"AAAA,cAAc,cAAc,CAAC;AAC7B,cAAc,kBAAkB,CAAC;AACjC,cAAc,gBAAgB,CAAC;AAC/B,cAAc,sBAAsB,CAAC;AACrC,cAAc,YAAY,CAAC"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../src/service/vo/index.ts"],"names":[],"mappings":"AAAA,cAAc,cAAc,CAAC;AAC7B,cAAc,kBAAkB,CAAC;AACjC,cAAc,gBAAgB,CAAC;AAC/B,cAAc,sBAAsB,CAAC;AACrC,cAAc,YAAY,CAAC;AAC3B,cAAc,cAAc,CAAC"}

package/out/service/vo/index.js

@@ -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/out/service/vo/map-data/map-data.d.ts

@@ -3,7 +3,7 @@ import { IMapData } from '../../../interface';
 export declare class MapData implements IMapData {
     [key: string | symbol]: any;
     _id: string;
-    _type: 'point' | 'area';
+    _itemStyle: string;
     _mapItemId: string;
     _longitude?: string;
     _latitude?: string;

package/out/service/vo/map-data/map-data.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"map-data.d.ts","sourceRoot":"","sources":["../../../../src/service/vo/map-data/map-data.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,WAAW,EAAE,MAAM,kBAAkB,CAAC;AAC/C,OAAO,EAAE,QAAQ,EAAE,MAAM,oBAAoB,CAAC;AAgB9C,qBAAa,OAAQ,YAAW,QAAQ;IAEtC,CAAC,GAAG,EAAE,MAAM,GAAG,MAAM,GAAG,GAAG,CAAC;IAE5B,GAAG,EAAE,MAAM,CAAC;IAEZ,KAAK,EAAE,OAAO,GAAG,MAAM,CAAC;IAExB,UAAU,EAAE,MAAM,CAAC;IAEnB,UAAU,CAAC,EAAE,MAAM,CAAa;IAEhC,SAAS,CAAC,EAAE,MAAM,CAAa;IAE/B,SAAS,CAAC,EAAE,MAAM,CAAa;IAE/B,QAAQ,CAAC,EAAE,MAAM,CAAa;IAE9B,MAAM,CAAC,EAAE,MAAM,CAAa;IAE5B,KAAK,CAAC,EAAE,MAAM,CAAa;IAE3B,OAAO,CAAC,EAAE,MAAM,CAAa;gBAEjB,MAAM,EAAE,KAAK,EAAE,OAAO,EAAE,WAAW;CAgFhD"}
+{"version":3,"file":"map-data.d.ts","sourceRoot":"","sources":["../../../../src/service/vo/map-data/map-data.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,WAAW,EAAE,MAAM,kBAAkB,CAAC;AAC/C,OAAO,EAAE,QAAQ,EAAE,MAAM,oBAAoB,CAAC;AAkB9C,qBAAa,OAAQ,YAAW,QAAQ;IAEtC,CAAC,GAAG,EAAE,MAAM,GAAG,MAAM,GAAG,GAAG,CAAC;IAE5B,GAAG,EAAE,MAAM,CAAC;IAEZ,UAAU,EAAE,MAAM,CAAC;IAEnB,UAAU,EAAE,MAAM,CAAC;IAEnB,UAAU,CAAC,EAAE,MAAM,CAAa;IAEhC,SAAS,CAAC,EAAE,MAAM,CAAa;IAE/B,SAAS,CAAC,EAAE,MAAM,CAAa;IAE/B,QAAQ,CAAC,EAAE,MAAM,CAAa;IAE9B,MAAM,CAAC,EAAE,MAAM,CAAa;IAE5B,KAAK,CAAC,EAAE,MAAM,CAAa;IAE3B,OAAO,CAAC,EAAE,MAAM,CAAa;gBAEjB,MAAM,EAAE,KAAK,EAAE,OAAO,EAAE,WAAW;CAgFhD"}

package/out/service/vo/map-data/map-data.js

@@ -11,6 +11,7 @@ function updateKeyDefine(target, keys) {
         }
     });
 }
+const AreaItemStyles = ['REGION', 'REGION2', 'REGION3', 'REGION4'];
 export class MapData {
     constructor(deData, mapItem) {
         this._longitude = undefined;
@@ -20,12 +21,12 @@ export class MapData {
         this._value = undefined;
         this._text = undefined;
         this._symbol = undefined;
-        const { id, itemType, longitudeAppDEFieldId, latitudeAppDEFieldId, textAppDEFieldId, dataAppDEFieldId, tipsAppDEFieldId, sysImage, } = mapItem;
+        const { id, itemStyle, longitudeAppDEFieldId, latitudeAppDEFieldId, textAppDEFieldId, dataAppDEFieldId, tipsAppDEFieldId, sysImage, } = mapItem;
         const keyMap = new Map();
         this._id = id + deData.srfkey;
-        this._type = itemType;
+        this._itemStyle = itemStyle;
         this._mapItemId = id;
-        if (itemType === 'area') {
+        if (AreaItemStyles.includes(this._itemStyle)) {
             if (longitudeAppDEFieldId) {
                 keyMap.set('_areaCode', longitudeAppDEFieldId);
             }

package/out/service/vo/panel-data/index.d.ts

@@ -0,0 +1,2 @@
+export { PanelData } from './panel-data';
+//# sourceMappingURL=index.d.ts.map

package/out/service/vo/panel-data/index.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../../src/service/vo/panel-data/index.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,SAAS,EAAE,MAAM,cAAc,CAAC"}

package/out/service/vo/panel-data/index.js

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

package/out/service/vo/panel-data/panel-data.d.ts

@@ -0,0 +1,26 @@
+import { IPanelField } from '@ibiz/model-core';
+import { QXEvent } from 'qx-util';
+type ChangeCallBack = (field: string) => void;
+/**
+ * 面板数据
+ * @author lxm
+ * @date 2023-11-01 05:13:53
+ * @export
+ * @class PanelData
+ */
+export declare class PanelData {
+    [key: string | symbol]: any;
+    /**
+     * 事件
+     * @author lxm
+     * @date 2023-11-02 02:35:33
+     * @protected
+     */
+    _evt: QXEvent<{
+        change: ChangeCallBack;
+    }>;
+    constructor(fields: IPanelField[], origin: IParams);
+    destroy(): void;
+}
+export {};
+//# sourceMappingURL=panel-data.d.ts.map

package/out/service/vo/panel-data/panel-data.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"panel-data.d.ts","sourceRoot":"","sources":["../../../../src/service/vo/panel-data/panel-data.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,WAAW,EAAE,MAAM,kBAAkB,CAAC;AAC/C,OAAO,EAAE,OAAO,EAAE,MAAM,SAAS,CAAC;AAgBlC,KAAK,cAAc,GAAG,CAAC,KAAK,EAAE,MAAM,KAAK,IAAI,CAAC;AAE9C;;;;;;GAMG;AACH,qBAAa,SAAS;IAEpB,CAAC,GAAG,EAAE,MAAM,GAAG,MAAM,GAAG,GAAG,CAAC;IAE5B;;;;;OAKG;IACK,IAAI,EAAE,OAAO,CAAC;QAAE,MAAM,EAAE,cAAc,CAAA;KAAE,CAAC,CAAC;gBAEtC,MAAM,EAAE,WAAW,EAAE,EAAE,MAAM,EAAE,OAAO;IAoElD,OAAO,IAAI,IAAI;CAGhB"}

package/out/service/vo/panel-data/panel-data.js

@@ -0,0 +1,90 @@
+/* eslint-disable no-constructor-return */
+import { QXEvent } from 'qx-util';
+// 更新属性，缺的补充定义
+function updateKeyDefine(target, keys) {
+    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 {
+    constructor(fields, origin) {
+        const _evt = new QXEvent();
+        // 面板属性映射绑定项
+        const keyMap = {};
+        // 绑定项映射面板属性
+        const reverseKeyMap = {};
+        fields.forEach(field => {
+            var _a;
+            keyMap[field.id] = (_a = field.viewFieldName) === null || _a === void 0 ? void 0 : _a.toLowerCase();
+            if (field.viewFieldName) {
+                reverseKeyMap[field.viewFieldName.toLowerCase()] = field.id;
+            }
+        });
+        return new Proxy(this, {
+            set(target, p, value) {
+                if (Object.prototype.hasOwnProperty.call(keyMap, p)) {
+                    if (keyMap[p]) {
+                        // 有面板属性有绑定数据项修改原始对象
+                        origin[keyMap[p]] = value;
+                    }
+                    else {
+                        // 有面板属性没有绑定数据项的改自身
+                        target[p] = value;
+                    }
+                }
+                else {
+                    // 没有面板属性的直接修改原始对象，视图面板对象一开始就是空的，没有任何属性
+                    origin[p] = value;
+                }
+                _evt.emit('change', p);
+                // 修改面板属性，同步抛原值变更
+                if (keyMap[p] && keyMap[p] !== p) {
+                    _evt.emit('change', keyMap[p]);
+                }
+                // 修改原值变更，同时抛面板属性变更
+                if (reverseKeyMap[p] && reverseKeyMap[p] !== p) {
+                    _evt.emit('change', reverseKeyMap[p]);
+                }
+                return true;
+            },
+            get(target, p, _receiver) {
+                if (p === '_evt') {
+                    return _evt;
+                }
+                // 有映射拿原始对象
+                if (keyMap[p]) {
+                    return origin[keyMap[p]];
+                }
+                // 源对象的属性可以直接拿
+                if (Object.prototype.hasOwnProperty.call(origin, p)) {
+                    return origin[p];
+                }
+                // 最后拿自身
+                return target[p];
+            },
+            ownKeys(target) {
+                // 只返回原始数据的键，自身的只是前端映射使用不需要在复制和后台传递时使用
+                const allKeys = Object.keys(origin);
+                updateKeyDefine(target, allKeys);
+                return allKeys;
+            },
+        });
+    }
+    destroy() {
+        this._evt.reset();
+    }
+}

package/out/service/vo/tree-node-data/tree-data-set-node-data.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"tree-data-set-node-data.d.ts","sourceRoot":"","sources":["../../../../src/service/vo/tree-node-data/tree-data-set-node-data.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,kBAAkB,EAAE,mBAAmB,EAAE,MAAM,kBAAkB,CAAC;AAC3E,OAAO,EAAE,KAAK,EAAE,aAAa,EAAE,MAAM,oBAAoB,CAAC;AAG1D,OAAO,EAAE,YAAY,EAAE,MAAM,kBAAkB,CAAC;AAEhD;;;;;;;GAOG;AACH,qBAAa,mBAAoB,SAAQ,YAAa,YAAW,aAAa;IAC5E,IAAI,EAAE,MAAM,CAAC;IAEb,EAAE,EAAE,MAAM,CAAC;IAEX,KAAK,EAAE,MAAM,CAAC;IAEd,MAAM,EAAE,KAAK,CAAC;gBAGZ,KAAK,EAAE,kBAAkB,EACzB,cAAc,EAAE,aAAa,GAAG,SAAS,EACzC,IAAI,EAAE;QACJ,IAAI,EAAE,KAAK,CAAC;QACZ,IAAI,EAAE,OAAO,CAAC;QACd,UAAU,CAAC,EAAE,OAAO,CAAC;QACrB,SAAS,CAAC,EAAE,OAAO,CAAC;KACrB;IA4BH,SAAS,CAAC,QAAQ,CAAC,KAAK,EAAE,kBAAkB,GAAG,KAAK,GAAG,SAAS;IAiBhE;;;;;;;OAOG;IACH,SAAS,CAAC,kBAAkB,CAC1B,QAAQ,EAAE,mBAAmB,GAC5B,MAAM,GAAG,SAAS;IAYrB;;;;;;;OAOG;IACH,SAAS,CAAC,YAAY,CAAC,KAAK,EAAE,kBAAkB,GAAG,MAAM,GAAG,SAAS;CAStE"}
+{"version":3,"file":"tree-data-set-node-data.d.ts","sourceRoot":"","sources":["../../../../src/service/vo/tree-node-data/tree-data-set-node-data.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,kBAAkB,EAAE,mBAAmB,EAAE,MAAM,kBAAkB,CAAC;AAC3E,OAAO,EAAE,KAAK,EAAE,aAAa,EAAE,MAAM,oBAAoB,CAAC;AAG1D,OAAO,EAAE,YAAY,EAAE,MAAM,kBAAkB,CAAC;AAEhD;;;;;;;GAOG;AACH,qBAAa,mBAAoB,SAAQ,YAAa,YAAW,aAAa;IAC5E,IAAI,EAAE,MAAM,CAAC;IAEb,EAAE,EAAE,MAAM,CAAC;IAEX,KAAK,EAAE,MAAM,CAAC;IAEd,MAAM,EAAE,KAAK,CAAC;gBAGZ,KAAK,EAAE,kBAAkB,EACzB,cAAc,EAAE,aAAa,GAAG,SAAS,EACzC,IAAI,EAAE;QACJ,IAAI,EAAE,KAAK,CAAC;QACZ,IAAI,EAAE,OAAO,CAAC;QACd,UAAU,CAAC,EAAE,OAAO,CAAC;QACrB,SAAS,CAAC,EAAE,OAAO,CAAC;KACrB;IAgCH,SAAS,CAAC,QAAQ,CAAC,KAAK,EAAE,kBAAkB,GAAG,KAAK,GAAG,SAAS;IAiBhE;;;;;;;OAOG;IACH,SAAS,CAAC,kBAAkB,CAC1B,QAAQ,EAAE,mBAAmB,GAC5B,MAAM,GAAG,SAAS;IAYrB;;;;;;;OAOG;IACH,SAAS,CAAC,YAAY,CAAC,KAAK,EAAE,kBAAkB,GAAG,MAAM,GAAG,SAAS;CAStE"}

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

@@ -14,8 +14,12 @@ export class TreeDataSetNodeData extends TreeNodeData {
         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;