@ibiz-template/runtime 0.2.8 → 0.2.9

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/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,21 @@
+import { IPanelField } from '@ibiz/model-core';
+/**
+ * 面板数据
+ * @author lxm
+ * @date 2023-11-01 05:13:53
+ * @export
+ * @class PanelData
+ */
+export declare class PanelData {
+    [key: string | symbol]: any;
+    /**
+     * 父视图参数
+     * @author lxm
+     * @date 2023-10-27 04:08:59
+     * @protected
+     * @type {IParams}
+     */
+    protected _origin?: IParams;
+    constructor(fields: IPanelField[], origin: IParams);
+}
+//# 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;AAgB/C;;;;;;GAMG;AACH,qBAAa,SAAS;IAEpB,CAAC,GAAG,EAAE,MAAM,GAAG,MAAM,GAAG,GAAG,CAAC;IAE5B;;;;;;OAMG;IACH,UAAkB,OAAO,CAAC,EAAE,OAAO,CAAC;gBAExB,MAAM,EAAE,WAAW,EAAE,EAAE,MAAM,EAAE,OAAO;CAsDnD"}

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

@@ -0,0 +1,73 @@
+/* eslint-disable no-constructor-return */
+// 更新属性，缺的补充定义
+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 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[keyMap[p]] = value;
+                }
+                return true;
+            },
+            get(target, p, _receiver) {
+                // 有映射拿原始对象
+                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;
+            },
+        });
+    }
+}

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;

package/out/ui-logic/ui-logic-context.d.ts

@@ -1,4 +1,4 @@
-import { IUILogicParams } from '../interface';
+import { IUILogicContext, IUILogicParams } from '../interface';
 import { UILogicParam } from './ui-logic-param/ui-logic-param';
 /**
  * 界面逻辑执行上下文
@@ -8,7 +8,7 @@ import { UILogicParam } from './ui-logic-param/ui-logic-param';
  * @export
  * @class UILogicContext
  */
-export declare class UILogicContext {
+export declare class UILogicContext implements IUILogicContext {
     private deLogicParams;
     parameters: IUILogicParams;
     /**
@@ -74,6 +74,7 @@ export declare class UILogicContext {
     defaultParamName: string;
     /**
      * 重置实体逻辑参数
+     *
      * @author lxm
      * @date 2023-03-24 09:18:02
      * @param {string} name
@@ -81,6 +82,7 @@ export declare class UILogicContext {
     resetParam(name: string): void;
     /**
      * 重新建立变量
+     *
      * @author lxm
      * @date 2023-03-24 09:20:24
      * @param {string} name
@@ -88,6 +90,7 @@ export declare class UILogicContext {
     renewParam(name: string): void;
     /**
      * 设置上一次返回值
+     *
      * @author lxm
      * @date 2023-09-04 09:23:52
      * @param {unknown} value
@@ -95,6 +98,7 @@ export declare class UILogicContext {
     setLastReturn(value: unknown): void;
     /**
      * 初始化上一次返回参数类型的逻辑参数
+     *
      * @author lxm
      * @date 2023-09-04 09:52:00
      * @param {string} tag
@@ -102,6 +106,7 @@ export declare class UILogicContext {
     initLastReturnParam(tag: string): void;
     /**
      * 是否是实体参数变量（即后台数据对象）
+     *
      * @author lxm
      * @date 2023-09-22 03:40:30
      * @param {string} paramId

package/out/ui-logic/ui-logic-context.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"ui-logic-context.d.ts","sourceRoot":"","sources":["../../src/ui-logic/ui-logic-context.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,cAAc,EAAE,MAAM,cAAc,CAAC;AAC9C,OAAO,EAAE,YAAY,EAAE,MAAM,iCAAiC,CAAC;AAE/D;;;;;;;GAOG;AACH,qBAAa,cAAc;IA4CvB,OAAO,CAAC,aAAa;IACd,UAAU,EAAE,cAAc;IA5CnC;;;;;OAKG;IACH,UAAU,EAAE,OAAO,CAAC;IAEpB;;OAEG;IACH,IAAI,OAAO,IAAI,QAAQ,CAKtB;IAED;;OAEG;IACH,IAAI,IAAI,IAAI,KAAK,CAEhB;IAED;;OAEG;IACH,IAAI,SAAS,IAAI,OAAO,CAKvB;IAED;;;;;;OAMG;gBAEO,aAAa,EAAE,GAAG,CAAC,MAAM,EAAE,YAAY,CAAC,EACzC,UAAU,EAAE,cAAc;IAGnC;;;;;;;OAOG;IAEH,MAAM,EAAE,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,CAAM;IAEjC;;;;;;OAMG;IACH,MAAM,EAAE,OAAO,CAAQ;IAEvB;;;;;;OAMG;IACH,SAAS,EAAE,OAAO,CAAS;IAE3B;;;;;;;OAOG;IACH,gBAAgB,EAAE,MAAM,CAAa;IAErC;;;;;OAKG;IACH,UAAU,CAAC,IAAI,EAAE,MAAM,GAAG,IAAI;IAI9B;;;;;OAKG;IACH,UAAU,CAAC,IAAI,EAAE,MAAM,GAAG,IAAI;IAI9B;;;;;OAKG;IACH,aAAa,CAAC,KAAK,EAAE,OAAO,GAAG,IAAI;IAInC;;;;;OAKG;IACH,mBAAmB,CAAC,GAAG,EAAE,MAAM,GAAG,IAAI;IAQtC;;;;;;OAMG;IACH,aAAa,CAAC,OAAO,EAAE,MAAM,GAAG,OAAO;CAIxC"}
+{"version":3,"file":"ui-logic-context.d.ts","sourceRoot":"","sources":["../../src/ui-logic/ui-logic-context.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,eAAe,EAAE,cAAc,EAAE,MAAM,cAAc,CAAC;AAC/D,OAAO,EAAE,YAAY,EAAE,MAAM,iCAAiC,CAAC;AAE/D;;;;;;;GAOG;AACH,qBAAa,cAAe,YAAW,eAAe;IA4ClD,OAAO,CAAC,aAAa;IACd,UAAU,EAAE,cAAc;IA5CnC;;;;;OAKG;IACH,UAAU,EAAE,OAAO,CAAC;IAEpB;;OAEG;IACH,IAAI,OAAO,IAAI,QAAQ,CAKtB;IAED;;OAEG;IACH,IAAI,IAAI,IAAI,KAAK,CAEhB;IAED;;OAEG;IACH,IAAI,SAAS,IAAI,OAAO,CAKvB;IAED;;;;;;OAMG;gBAEO,aAAa,EAAE,GAAG,CAAC,MAAM,EAAE,YAAY,CAAC,EACzC,UAAU,EAAE,cAAc;IAGnC;;;;;;;OAOG;IAEH,MAAM,EAAE,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,CAAM;IAEjC;;;;;;OAMG;IACH,MAAM,EAAE,OAAO,CAAQ;IAEvB;;;;;;OAMG;IACH,SAAS,EAAE,OAAO,CAAS;IAE3B;;;;;;;OAOG;IACH,gBAAgB,EAAE,MAAM,CAAa;IAErC;;;;;;OAMG;IACH,UAAU,CAAC,IAAI,EAAE,MAAM,GAAG,IAAI;IAI9B;;;;;;OAMG;IACH,UAAU,CAAC,IAAI,EAAE,MAAM,GAAG,IAAI;IAI9B;;;;;;OAMG;IACH,aAAa,CAAC,KAAK,EAAE,OAAO,GAAG,IAAI;IAInC;;;;;;OAMG;IACH,mBAAmB,CAAC,GAAG,EAAE,MAAM,GAAG,IAAI;IAQtC;;;;;;;OAOG;IACH,aAAa,CAAC,OAAO,EAAE,MAAM,GAAG,OAAO;CAIxC"}

package/out/ui-logic/ui-logic-context.js

@@ -79,6 +79,7 @@ export class UILogicContext {
     }
     /**
      * 重置实体逻辑参数
+     *
      * @author lxm
      * @date 2023-03-24 09:18:02
      * @param {string} name
@@ -89,6 +90,7 @@ export class UILogicContext {
     }
     /**
      * 重新建立变量
+     *
      * @author lxm
      * @date 2023-03-24 09:20:24
      * @param {string} name
@@ -99,6 +101,7 @@ export class UILogicContext {
     }
     /**
      * 设置上一次返回值
+     *
      * @author lxm
      * @date 2023-09-04 09:23:52
      * @param {unknown} value
@@ -108,6 +111,7 @@ export class UILogicContext {
     }
     /**
      * 初始化上一次返回参数类型的逻辑参数
+     *
      * @author lxm
      * @date 2023-09-04 09:52:00
      * @param {string} tag
@@ -121,6 +125,7 @@ export class UILogicContext {
     }
     /**
      * 是否是实体参数变量（即后台数据对象）
+     *
      * @author lxm
      * @date 2023-09-22 03:40:30
      * @param {string} paramId

package/out/ui-logic/ui-logic-node/index.d.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/out/ui-logic/ui-logic-node/index.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../src/ui-logic/ui-logic-node/index.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,YAAY,EAAE,MAAM,iCAAiC,CAAC;AAC/D,OAAO,EAAE,cAAc,EAAE,MAAM,uCAAuC,CAAC;AACvE,OAAO,EAAE,SAAS,EAAE,MAAM,yBAAyB,CAAC;AACpD,OAAO,EAAE,OAAO,EAAE,MAAM,qBAAqB,CAAC;AAC9C,OAAO,EAAE,kBAAkB,EAAE,MAAM,+CAA+C,CAAC;AACnF,OAAO,EAAE,WAAW,EAAE,MAAM,iBAAiB,CAAC;AAC9C,OAAO,EAAE,kBAAkB,EAAE,MAAM,+CAA+C,CAAC;AACnF,OAAO,EAAE,aAAa,EAAE,MAAM,mCAAmC,CAAC;AAClE,OAAO,EAAE,UAAU,EAAE,MAAM,6BAA6B,CAAC;AACzD,OAAO,EAAE,cAAc,EAAE,MAAM,qCAAqC,CAAC;AACrE,OAAO,EAAE,cAAc,EAAE,MAAM,qCAAqC,CAAC;AACrE,OAAO,EAAE,aAAa,EAAE,MAAM,mCAAmC,CAAC;AAClE,OAAO,EAAE,eAAe,EAAE,MAAM,uCAAuC,CAAC;AACxE,OAAO,EAAE,aAAa,EAAE,MAAM,mCAAmC,CAAC;AAClE,OAAO,EAAE,cAAc,EAAE,MAAM,qCAAqC,CAAC;AACrE,OAAO,EAAE,WAAW,EAAE,MAAM,+BAA+B,CAAC;AAC5D,OAAO,EAAE,kBAAkB,EAAE,MAAM,6CAA6C,CAAC;AACjF,OAAO,EAAE,qBAAqB,EAAE,MAAM,uDAAuD,CAAC;AAC9F,OAAO,EAAE,kBAAkB,EAAE,MAAM,+CAA+C,CAAC"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../src/ui-logic/ui-logic-node/index.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,YAAY,EAAE,MAAM,iCAAiC,CAAC;AAC/D,OAAO,EAAE,cAAc,EAAE,MAAM,uCAAuC,CAAC;AACvE,OAAO,EAAE,SAAS,EAAE,MAAM,yBAAyB,CAAC;AACpD,OAAO,EAAE,OAAO,EAAE,MAAM,qBAAqB,CAAC;AAC9C,OAAO,EAAE,kBAAkB,EAAE,MAAM,+CAA+C,CAAC;AACnF,OAAO,EAAE,WAAW,EAAE,MAAM,iBAAiB,CAAC;AAC9C,OAAO,EAAE,kBAAkB,EAAE,MAAM,+CAA+C,CAAC;AACnF,OAAO,EAAE,aAAa,EAAE,MAAM,mCAAmC,CAAC;AAClE,OAAO,EAAE,UAAU,EAAE,MAAM,6BAA6B,CAAC;AACzD,OAAO,EAAE,YAAY,EAAE,MAAM,iCAAiC,CAAC;AAC/D,OAAO,EAAE,cAAc,EAAE,MAAM,qCAAqC,CAAC;AACrE,OAAO,EAAE,cAAc,EAAE,MAAM,qCAAqC,CAAC;AACrE,OAAO,EAAE,aAAa,EAAE,MAAM,mCAAmC,CAAC;AAClE,OAAO,EAAE,eAAe,EAAE,MAAM,uCAAuC,CAAC;AACxE,OAAO,EAAE,aAAa,EAAE,MAAM,mCAAmC,CAAC;AAClE,OAAO,EAAE,cAAc,EAAE,MAAM,qCAAqC,CAAC;AACrE,OAAO,EAAE,WAAW,EAAE,MAAM,+BAA+B,CAAC;AAC5D,OAAO,EAAE,kBAAkB,EAAE,MAAM,6CAA6C,CAAC;AACjF,OAAO,EAAE,qBAAqB,EAAE,MAAM,uDAAuD,CAAC;AAC9F,OAAO,EAAE,kBAAkB,EAAE,MAAM,+CAA+C,CAAC"}

package/out/ui-logic/ui-logic-node/index.js

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

@@ -0,0 +1,17 @@
+import { IDEUIPFPluginLogic } from '@ibiz/model-core';
+import { UILogicContext } from '../../ui-logic-context';
+import { UILogicNode } from '../ui-logic-node';
+/**
+ * 前端插件节点
+ *
+ * @author chitanda
+ * @date 2023-11-01 18:11:55
+ * @export
+ * @class PFPluginNode
+ * @extends {UILogicNode}
+ */
+export declare class PFPluginNode extends UILogicNode {
+    model: IDEUIPFPluginLogic;
+    exec(ctx: UILogicContext): Promise<void>;
+}
+//# sourceMappingURL=pf-plugin-node.d.ts.map

package/out/ui-logic/ui-logic-node/pf-plugin-node/pf-plugin-node.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"pf-plugin-node.d.ts","sourceRoot":"","sources":["../../../../src/ui-logic/ui-logic-node/pf-plugin-node/pf-plugin-node.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,kBAAkB,EAAE,MAAM,kBAAkB,CAAC;AACtD,OAAO,EAAE,cAAc,EAAE,MAAM,wBAAwB,CAAC;AACxD,OAAO,EAAE,WAAW,EAAE,MAAM,kBAAkB,CAAC;AAG/C;;;;;;;;GAQG;AACH,qBAAa,YAAa,SAAQ,WAAW;IACnC,KAAK,EAAE,kBAAkB,CAAC;IAE5B,IAAI,CAAC,GAAG,EAAE,cAAc,GAAG,OAAO,CAAC,IAAI,CAAC;CAM/C"}

package/out/ui-logic/ui-logic-node/pf-plugin-node/pf-plugin-node.js

@@ -0,0 +1,19 @@
+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 {
+    async exec(ctx) {
+        const provider = await getUILogicNodeProvider(this.model);
+        if (provider) {
+            await provider.exec(this.model, ctx);
+        }
+    }
+}

package/out/ui-logic/ui-logic.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"ui-logic.d.ts","sourceRoot":"","sources":["../../src/ui-logic/ui-logic.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,UAAU,EAAE,MAAM,kBAAkB,CAAC;AAC9C,OAAO,EAAE,cAAc,EAAE,MAAM,cAAc,CAAC;AAC9C,OAAO,EAAE,cAAc,EAAE,MAAM,oBAAoB,CAAC;AACpD,OAAO,EAiBL,WAAW,EAGZ,MAAM,iBAAiB,CAAC;AACzB,OAAO,EAAE,YAAY,EAAE,MAAM,iCAAiC,CAAC;AAE/D;;;;;;;GAOG;AACH,qBAAa,OAAO;IA2BN,SAAS,CAAC,KAAK,EAAE,UAAU;IA1BvC;;;;;;;OAOG;IACH,SAAS,CAAC,KAAK,EAAE,GAAG,CAAC,MAAM,EAAE,WAAW,CAAC,CAAa;IAEtD;;;;;;;OAOG;IACH,SAAS,CAAC,MAAM,EAAE,GAAG,CAAC,MAAM,EAAE,YAAY,CAAC,CAAa;IAExD;;;;;OAKG;gBACmB,KAAK,EAAE,UAAU;IAkFvC;;;;;;;;;;OAUG;IACH,SAAS,CAAC,eAAe,CAAC,GAAG,EAAE,cAAc,GAAG,IAAI;IASpD;;;;;;;;;OASG;IACG,IAAI,CAAC,UAAU,EAAE,cAAc,GAAG,OAAO,CAAC,OAAO,CAAC;IAmBxD;;;;;;;;;;;;;OAaG;cACa,QAAQ,CACtB,IAAI,EAAE,WAAW,EACjB,GAAG,EAAE,cAAc,GAClB,OAAO,CAAC,IAAI,CAAC;CAiBjB"}
+{"version":3,"file":"ui-logic.d.ts","sourceRoot":"","sources":["../../src/ui-logic/ui-logic.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,UAAU,EAAE,MAAM,kBAAkB,CAAC;AAC9C,OAAO,EAAE,cAAc,EAAE,MAAM,cAAc,CAAC;AAC9C,OAAO,EAAE,cAAc,EAAE,MAAM,oBAAoB,CAAC;AACpD,OAAO,EAkBL,WAAW,EAGZ,MAAM,iBAAiB,CAAC;AACzB,OAAO,EAAE,YAAY,EAAE,MAAM,iCAAiC,CAAC;AAE/D;;;;;;;GAOG;AACH,qBAAa,OAAO;IA2BN,SAAS,CAAC,KAAK,EAAE,UAAU;IA1BvC;;;;;;;OAOG;IACH,SAAS,CAAC,KAAK,EAAE,GAAG,CAAC,MAAM,EAAE,WAAW,CAAC,CAAa;IAEtD;;;;;;;OAOG;IACH,SAAS,CAAC,MAAM,EAAE,GAAG,CAAC,MAAM,EAAE,YAAY,CAAC,CAAa;IAExD;;;;;OAKG;gBACmB,KAAK,EAAE,UAAU;IAoFvC;;;;;;;;;;OAUG;IACH,SAAS,CAAC,eAAe,CAAC,GAAG,EAAE,cAAc,GAAG,IAAI;IASpD;;;;;;;;;OASG;IACG,IAAI,CAAC,UAAU,EAAE,cAAc,GAAG,OAAO,CAAC,OAAO,CAAC;IAmBxD;;;;;;;;;;;;;OAaG;cACa,QAAQ,CACtB,IAAI,EAAE,WAAW,EACjB,GAAG,EAAE,cAAc,GAClB,OAAO,CAAC,IAAI,CAAC;CAiBjB"}

package/out/ui-logic/ui-logic.js

@@ -1,7 +1,7 @@
 /* eslint-disable no-await-in-loop */
 import { ModelError, RuntimeModelError } from '@ibiz-template/core';
 import { UILogicContext } from './ui-logic-context';
-import { AppendParamNode, BindParamNode, CopyParamNode, DataSetNode, DEActionNode, DebugParamNode, DEUIActionNode, EndNode, ExecuteDELogicNode, MsgBoxNode, PrepareJSParamNode, RenewParamNode, ResetParamNode, SortParamNode, StartNode, ThrowExceptionNode, ViewCtrlFireEventNode, ViewCtrlInvokeNode, } from './ui-logic-node';
+import { AppendParamNode, BindParamNode, CopyParamNode, DataSetNode, DEActionNode, DebugParamNode, DEUIActionNode, EndNode, ExecuteDELogicNode, MsgBoxNode, PFPluginNode, PrepareJSParamNode, RenewParamNode, ResetParamNode, SortParamNode, StartNode, ThrowExceptionNode, ViewCtrlFireEventNode, ViewCtrlInvokeNode, } from './ui-logic-node';
 import { UILogicParam } from './ui-logic-param/ui-logic-param';
 /**
  * 界面逻辑
@@ -101,6 +101,8 @@ export class UILogic {
                     logicNode = new ExecuteDELogicNode(node);
                     break;
                 case 'PFPLUGIN': // 前端插件调用
+                    logicNode = new PFPluginNode(node);
+                    break;
                 default:
                     throw new ModelError(node, `未支持的逻辑节点类型: ${logicNodeType}`);
             }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@ibiz-template/runtime",
-  "version": "0.2.8",
+  "version": "0.2.9",
   "description": "控制器包",
   "type": "module",
   "main": "out/index.js",
@@ -59,5 +59,5 @@
     "qx-util": "^0.4.8",
     "ramda": "^0.29.0"
   },
-  "gitHead": "98917f0e99351acbe3ca6241011ff1da2794e55a"
+  "gitHead": "1502d43393de4cc75f670d0ba22d901e158e0c00"
 }

package/src/controller/common/control/md-control.controller.ts

@@ -1,6 +1,6 @@
 /* eslint-disable max-classes-per-file */
 import { isElementSame, RuntimeError } from '@ibiz-template/core';
-import { IAppDataEntity, IMDControl } from '@ibiz/model-core';
+import { IAppDataEntity, IAppDEDataImport, IMDControl } from '@ibiz/model-core';
 import { debounce } from 'lodash-es';
 import {
   IMDControlController,
@@ -428,27 +428,27 @@ export class MDControlController<
    * @returns {*}  {Promise<void>}
    */
   async importData(): Promise<void> {
-    // const { appEntity, dataImport } = this.model;
-    // let templateUrl = `${appEntity.deNamePlural}/importtemplate`;
-    // let importUrl = `${appEntity.deNamePlural}/importdata2`;
-    // if (dataImport) {
-    //   templateUrl += `?srfimporttag=${dataImport.codeName}`;
-    //   importUrl += `?srfimporttag=${dataImport.codeName}`;
-    // }
-    // const modal = ibiz.overlay.createModal(
-    //   'DataImport',
-    //   {
-    //     dismiss: () => modal.dismiss(),
-    //     templateUrl,
-    //     importUrl,
-    //   },
-    //   {
-    //     width: 'auto',
-    //     placement: 'center',
-    //   },
-    // );
-    // modal.present();
-    // await modal.onWillDismiss();
+    const { appDataEntityId, dedataImportId } = this.model;
+    const appDataEntity = await ibiz.hub.getAppDataEntity(appDataEntityId!);
+    const dataImport = appDataEntity.appDEDataImports?.find(
+      (importItem: IAppDEDataImport) => importItem.id === dedataImportId,
+    );
+    if (!dataImport) {
+      throw new RuntimeError('无导入模型！');
+    }
+    const modal = ibiz.overlay.createModal(
+      'DataImport',
+      {
+        dismiss: () => modal.dismiss(),
+        appDataEntity,
+      },
+      {
+        width: 'auto',
+        placement: 'center',
+      },
+    );
+    modal.present();
+    await modal.onWillDismiss();
   }
 
   /**

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

@@ -82,6 +82,22 @@ export class FormDetailController<T extends IDEFormDetail = IDEFormDetail>
     return [...this.state.class.label, ...this.state.class.labelDyna];
   }
 
+  /**
+   * 动态逻辑结果
+   * @author lxm
+   * @date 2023-09-21 03:36:37
+   * @protected
+   */
+  protected dynaLogicResult: {
+    visible?: boolean;
+    disabled?: boolean;
+    required?: boolean;
+  } = {
+    visible: undefined,
+    disabled: undefined,
+    required: undefined,
+  };
+
   /**
    * Creates an instance of FormDetailController.
    * @author lxm
@@ -267,20 +283,22 @@ export class FormDetailController<T extends IDEFormDetail = IDEFormDetail>
    * @param {IData} data
    */
   calcDetailDisabled(data: IData): void {
-    let enable = !this.dynaLogicResult.disabled;
+    let { disabled } = this.dynaLogicResult;
 
     // 上层计算为启用时计算预定义项启用逻辑
-    if (enable && this.form.scheduler) {
+    if (disabled !== true && this.form.scheduler) {
       const itemEnable = this.form.scheduler.triggerItemEnable(this.model.id!, {
         data: [data],
       });
       if (itemEnable !== undefined) {
-        enable = itemEnable;
+        disabled = !itemEnable;
       }
     }
 
-    // 修改state
-    this.state.disabled = !enable;
+    // 有值的时候才会去修改state
+    if (disabled !== undefined) {
+      this.state.disabled = disabled;
+    }
   }
 
   /**
@@ -292,7 +310,7 @@ export class FormDetailController<T extends IDEFormDetail = IDEFormDetail>
     let { visible } = this.dynaLogicResult;
 
     // 上层计算为显示时计算预定义项显示逻辑
-    if (visible && this.form.scheduler) {
+    if (visible !== false && this.form.scheduler) {
       const itemVIsible = this.form.scheduler.triggerItemVisible(
         this.model.id!,
         {
@@ -304,8 +322,10 @@ export class FormDetailController<T extends IDEFormDetail = IDEFormDetail>
       }
     }
 
-    // 修改state
-    this.state.visible = visible;
+    // 有值的时候才会去修改state
+    if (visible !== undefined) {
+      this.state.visible = visible;
+    }
   }
 
   /**
@@ -314,10 +334,10 @@ export class FormDetailController<T extends IDEFormDetail = IDEFormDetail>
    * @param {IData} data
    */
   calcDetailRequired(data: IData): void {
-    let allowEmpty = !this.dynaLogicResult.required;
+    let { required } = this.dynaLogicResult;
 
     // 上层计算为启用时计算预定义项空输入逻辑
-    if (allowEmpty && this.form.scheduler) {
+    if (required !== true && this.form.scheduler) {
       const itemAllowEmpty = this.form.scheduler.triggerItemBlank(
         this.model.id!,
         {
@@ -325,23 +345,13 @@ export class FormDetailController<T extends IDEFormDetail = IDEFormDetail>
         },
       );
       if (itemAllowEmpty !== undefined) {
-        allowEmpty = itemAllowEmpty;
+        required = !itemAllowEmpty;
       }
     }
 
-    // 修改state
-    this.state.required = !allowEmpty;
+    // 有值的时候才会去修改state
+    if (required !== undefined) {
+      this.state.required = required;
+    }
   }
-
-  /**
-   * 动态逻辑结果
-   * @author lxm
-   * @date 2023-09-21 03:36:37
-   * @protected
-   */
-  protected dynaLogicResult = {
-    visible: true,
-    disabled: false,
-    required: false,
-  };
 }

package/src/controller/control/form/form-detail/form-group-panel/form-group-panel.controller.ts

@@ -57,8 +57,8 @@ export class FormGroupPanelController<
     await this.initActionStates();
   }
 
-  async formStateNotify(_state: FormNotifyState): Promise<void> {
-    super.calcDynamicLogic([], true);
+  async formStateNotify(state: FormNotifyState): Promise<void> {
+    super.formStateNotify(state);
     // 只在加载后台数据之后，更新界面行为组状态
     if (this.state.actionGroupState) {
       this.state.actionGroupState.update(this.form.data.getOrigin());

package/src/controller/control/form/form-detail/form-mdctrl/form-mdctrl-content-type.controller.ts

@@ -86,7 +86,7 @@ export class FormMDCtrlContentTypeController {
     if (index < 0) {
       return;
     }
-    this.parent.state.contentCtrlData.splice(index, 1);
+    this.parent.state.contentCtrlData?.splice(index, 1);
     this.parent.setFormDataValue();
   }
 
@@ -99,7 +99,7 @@ export class FormMDCtrlContentTypeController {
    * @memberof FormMDCtrlContentTypeController
    */
   onDataInsert(data?: IData): void {
-    this.parent.state.contentCtrlData.push(data || {});
+    this.parent.state.contentCtrlData?.push(data || {});
     this.parent.setFormDataValue();
   }