@ibiz-template/runtime 0.2.8 → 0.2.10

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.10",
   "description": "控制器包",
   "type": "module",
   "main": "out/index.js",
@@ -59,5 +59,5 @@
     "qx-util": "^0.4.8",
     "ramda": "^0.29.0"
   },
-  "gitHead": "98917f0e99351acbe3ca6241011ff1da2794e55a"
+  "gitHead": "0b78d7b2ba35e13ffa52c3214d21d01cc6c301cb"
 }

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();
   }
 

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

@@ -1,4 +1,5 @@
 import { IDEFormMDCtrl } from '@ibiz/model-core';
+import { clone } from 'ramda';
 import { FormDetailController } from '../form-detail';
 import { FormMDCtrlContentTypeController } from './form-mdctrl-content-type.controller';
 import { FormMDCtrlDataViewController } from './form-mdctrl-data-view/form-mdctrl-data-view.controller';
@@ -33,6 +34,30 @@ export class FormMDCtrlController extends FormDetailController<IDEFormMDCtrl> {
 
   declare form: EditFormController;
 
+  /**
+   * 是否显示添加按钮
+   *
+   * @memberof FormMDCtrlController
+   */
+  get isCreate(): boolean {
+    if (this.model.buildInActions) {
+      return [1, 3, 5, 7].includes(this.model.buildInActions);
+    }
+    return false;
+  }
+
+  /**
+   * 是否显示删除按钮
+   *
+   * @memberof FormMDCtrlController
+   */
+  get isDelete(): boolean {
+    if (this.model.buildInActions) {
+      return [4, 5, 6, 7].includes(this.model.buildInActions);
+    }
+    return false;
+  }
+
   /**
    * Creates an instance of FormMDCtrlController.
    *
@@ -126,7 +151,7 @@ export class FormMDCtrlController extends FormDetailController<IDEFormMDCtrl> {
     const name =
       this.model.appDEFieldId || this.model.fieldName || this.model.id;
     if (name) {
-      this.form.setDataValue(name, this.state.contentCtrlData);
+      this.form.setDataValue(name, clone(this.state.contentCtrlData));
     }
   }
 
@@ -151,4 +176,44 @@ export class FormMDCtrlController extends FormDetailController<IDEFormMDCtrl> {
   setDefaultValue(): void {
     // todo 设置默认值
   }
+
+  /**
+   * 表单数据变更通知
+   *
+   * @author lxm
+   * @date 2022-09-20 18:09:56
+   * @param {string[]} names
+   */
+  async dataChangeNotify(names: string[]): Promise<void> {
+    await super.dataChangeNotify(names);
+    const { resetItemNames } = this.model;
+    const mdctrlName =
+      this.model.appDEFieldId || this.model.fieldName || this.model.id!;
+
+    // 重置项，变更时自己的值置空
+    let isReset = false;
+    if (resetItemNames && resetItemNames.length > 0) {
+      resetItemNames.forEach((resetItemName: string) => {
+        if (names.includes(resetItemName)) {
+          isReset = true;
+        }
+      });
+    }
+    if (isReset) {
+      this.state.contentCtrlData = null;
+      this.setFormDataValue();
+    }
+
+    // 刚加载初始化时的值不校验,只校验自身值变更
+    if (names.includes(mdctrlName)) {
+      this.validate();
+    }
+
+    // 有表单项更新，且是自身变更时，触发表单项更新
+    if (names.includes(mdctrlName) && this.model.deformItemUpdateId) {
+      await (this.form as EditFormController).updateFormItem(
+        this.model.deformItemUpdateId,
+      );
+    }
+  }
 }

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

@@ -12,5 +12,5 @@ export class FormMDCtrlState extends FormDetailState {
    *
    * @type {Array<IData>}
    */
-  contentCtrlData: Array<IData> | IData = [];
+  contentCtrlData: Array<IData> | IData | null = [];
 }

package/src/controller/control/grid/grid/grid.controller.ts

@@ -32,7 +32,7 @@ import { getGridColumnProvider } from '../../../../register';
 import { ControlVO, Srfuf } from '../../../../service';
 import { MDControlController } from '../../../common';
 import { GridNotifyState } from '../../../constant';
-import { getDefaultValue, isValueChange } from '../../../utils';
+import { exportData, getDefaultValue, isValueChange } from '../../../utils';
 import { handleAllSettled, ScriptFactory } from '../../../../utils';
 
 /**
@@ -918,28 +918,28 @@ export class GridController
       this.fieldColumns;
     // 数据格式化
     const formatExcelData = (data: IData[]): IData[] => {
-      const codeListMap: Map<string, readonly CodeListItem[]> = new Map();
-      Object.keys(items).forEach((key: string) => {
-        if (items[key].codeList) {
-          codeListMap.set(key, items[key].codeListItems!);
-        }
-      });
+      // const codeListMap: Map<string, readonly CodeListItem[]> = new Map();
+      // Object.keys(items).forEach((key: string) => {
+      //   if (items[key].codeList) {
+      //     codeListMap.set(key, items[key].codeListItems!);
+      //   }
+      // });
       const cloneData = clone(
         data.map(item => {
           return item.getOrigin();
         }),
       );
-      cloneData.forEach(item => {
-        const fields = Object.keys(item);
-        fields.forEach((key: string) => {
-          if (codeListMap.get(key)) {
-            item[key] =
-              codeListMap.get(key)!.find(_item => {
-                return _item.value === item[key];
-              })?.text || item[key];
-          }
-        });
-      });
+      // cloneData.forEach(item => {
+      //   const fields = Object.keys(item);
+      //   fields.forEach((key: string) => {
+      //     if (codeListMap.get(key)) {
+      //       item[key] =
+      //         codeListMap.get(key)!.find(_item => {
+      //           return _item.value === item[key];
+      //         })?.text || item[key];
+      //     }
+      //   });
+      // });
       return cloneData;
     };
     const getExportData = async (): Promise<IData[]> => {
@@ -973,7 +973,7 @@ export class GridController
     const formatArrayData = (
       filterVal: string[],
       tableData: IData[],
-    ): IData[] => {
+    ): IData[][] => {
       return tableData.map(v => {
         return filterVal.map(j => {
           return v[j];
@@ -990,19 +990,7 @@ export class GridController
     );
     // 二维数组
     const data = formatArrayData(filterVal, await getExportData());
-    if (!ibiz.util.getExportExcel) {
-      throw new RuntimeError('ibiz.util.getExportExcel不存在');
-    }
-    const exportExcel = await ibiz.util.getExportExcel();
-    if (!exportExcel) {
-      throw new RuntimeError('导出模块加载错误');
-    }
-    exportExcel.exportJsonToExcel({
-      header, // 表头内容 数组格式
-      data, // 具体数据 这是个二维数组
-      filename: this.model.logicName!, // 文件名称
-      autoWidth: true, // 单元格是否自适应
-    });
+    await exportData(header, data, this.model.logicName!);
   }
 
   /**

package/src/controller/control/map/map.controller.ts

@@ -20,7 +20,7 @@ export class MapController
     this.state.size = 1000;
     this.state.pointData = [];
     this.state.areaData = [];
-    this.state.areaCode = 320000;
+    this.calcDefaultOptions();
   }
 
   protected async onCreated(): Promise<void> {
@@ -79,9 +79,9 @@ export class MapController
     const tempareaData: IMapData[] = [];
     const temppointData: IMapData[] = [];
     result.forEach(item => {
-      if (item._type === 'area') {
+      if (item._itemStyle === 'REGION') {
         tempareaData.push(item);
-      } else if (item._type === 'point') {
+      } else if (item._itemStyle === 'POINT') {
         temppointData.push(item);
       }
     });
@@ -91,6 +91,43 @@ export class MapController
     return result;
   }
 
+  /**
+   * 计算默认选项
+   * @author lxm
+   * @date 2023-11-01 03:23:33
+   */
+  calcDefaultOptions(): void {
+    this.state.strAreaCode = false;
+    this.state.defaultAreaCode = 100000;
+
+    if (this.model.controlParam?.ctrlParams) {
+      const { ctrlParams } = this.model.controlParam;
+      Object.keys(ctrlParams).forEach(key => {
+        const value = ctrlParams[key];
+        switch (key.toLowerCase()) {
+          case 'defaultareacode':
+            this.state.defaultAreaCode = value;
+            break;
+          case 'strareacode':
+            this.state.strAreaCode = value === 'true';
+            break;
+          case 'jsonbaseurl':
+            this.state.jsonBaseUrl = value;
+            break;
+          default:
+            break;
+        }
+      });
+    }
+
+    // 根据strAreaCode格式化默认区域代码的数值还是字符串
+    this.state.defaultAreaCode = this.state.strAreaCode
+      ? `${this.state.defaultAreaCode}`
+      : Number(this.state.defaultAreaCode);
+
+    this.state.areaCode = this.state.defaultAreaCode;
+  }
+
   /**
    * 地图变更事件处理
    * @author lxm