@ibiz-template/runtime 0.7.0 → 0.7.2

package/out/controller/control/grid/grid/grid.controller.js

@@ -333,21 +333,24 @@ export class GridController extends MDControlController {
             return row;
         });
         // 响应式写法，用state里遍历出来的row才是reactive
-        this.state.rows.forEach(row => {
-            Object.values(row.uaColStates).forEach(uaState => {
-                uaState.update(this.context, row.data.getOrigin(), this.model.appDataEntityId);
-            });
-        });
-        this.state.rows.forEach(row => {
-            Object.values(row.uiActionGroupStates).forEach(uaState => {
-                uaState.update(this.context, row.data.getOrigin(), this.model.appDataEntityId);
-            });
-        });
+        await this.updateRows(this.state.rows);
         this.calcGroupData(items);
         // await this.loadRemoteAgg();
         this.calcAggResult(items);
         return items;
     }
+    /**
+     * 更新行状态
+     * @param rows
+     */
+    async updateRows(rows) {
+        for (const row of rows) {
+            await Promise.all([
+                ...Object.values(row.uaColStates).map(uaState => uaState.update(this.context, row.data.getOrigin(), this.model.appDataEntityId)),
+                ...Object.values(row.uiActionGroupStates).map(uaState => uaState.update(this.context, row.data.getOrigin(), this.model.appDataEntityId)),
+            ]);
+        }
+    }
     /**
      * 计算分组数据
      * @author lxm
@@ -583,7 +586,7 @@ export class GridController extends MDControlController {
     async initColumnsController(column) {
         var _a;
         // 初始化适配器
-        const provider = await getGridColumnProvider(column);
+        const provider = await getGridColumnProvider(column, this.model);
         if (!provider) {
             return;
         }

package/out/controller/control/grid/grid-column/grid-field-edit-column/grid-field-edit-column.controller.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"grid-field-edit-column.controller.d.ts","sourceRoot":"","sources":["../../../../../../src/controller/control/grid/grid-column/grid-field-edit-column/grid-field-edit-column.controller.ts"],"names":[],"mappings":"AAEA,OAAO,EAAoB,eAAe,EAAE,MAAM,kBAAkB,CAAC;AAGrE,OAAO,EACL,0BAA0B,EAC1B,iBAAiB,EACjB,eAAe,EAChB,MAAM,0BAA0B,CAAC;AAKlC,OAAO,EAAE,eAAe,EAAE,MAAM,sBAAsB,CAAC;AAEvD,OAAO,EAAE,YAAY,EAAE,MAAM,2BAA2B,CAAC;AACzD,OAAO,EAAE,yBAAyB,EAAE,MAAM,sBAAsB,CAAC;AAEjE;;;;;GAKG;AACH,qBAAa,6BACX,SAAQ,yBACR,YAAW,0BAA0B;IAErC;;;;;;OAMG;IACH,QAAQ,EAAG,eAAe,CAAC;IAE3B;;;;;;OAMG;IACH,MAAM,EAAG,iBAAiB,CAAC;IAE3B;;;;;;OAMG;IACH,cAAc,CAAC,EAAE,eAAe,CAAC;IAEjC;;;;;;OAMG;IACH,KAAK,EAAE,KAAK,EAAE,CAAM;IAEpB;;;;;;;OAOG;IACH,OAAO,CAAC,SAAS,CAAU;IAE3B;;;;;;OAMG;IACH,IAAI,QAAQ,IAAI,MAAM,GAAG,SAAS,CAEjC;IAED;;;;;;OAMG;IACH,IAAI,WAAW,IAAI,MAAM,GAAG,SAAS,CAEpC;IAED;;;;;;OAMG;IACH,IAAI,aAAa,IAAI,MAAM,GAAG,SAAS,CAKtC;IAED;;;;;;;OAOG;cACa,MAAM,IAAI,OAAO,CAAC,IAAI,CAAC;IAuBvC;;;;;;;OAOG;cACa,SAAS,IAAI,OAAO,CAAC,IAAI,CAAC;IAsB1C;;;;;;;;OAQG;IACG,WAAW,CACf,GAAG,EAAE,YAAY,EACjB,KAAK,EAAE,OAAO,EACd,IAAI,CAAC,EAAE,MAAM,GACZ,OAAO,CAAC,IAAI,CAAC;IAKhB;;;;;;;OAOG;IACG,gBAAgB,CAAC,GAAG,EAAE,YAAY,EAAE,KAAK,EAAE,MAAM,EAAE,GAAG,OAAO,CAAC,IAAI,CAAC;IAoDzE;;;;;OAKG;IACH,eAAe,CAAC,GAAG,EAAE,YAAY,EAAE,MAAM,EAAE,eAAe,GAAG,IAAI;IAMjE;;;;;OAKG;IACH,kBAAkB,CAAC,GAAG,EAAE,YAAY,GAAG,IAAI;IAiB3C;;;;;OAKG;IACH,kBAAkB,CAAC,GAAG,EAAE,YAAY,GAAG,IAAI;IAe3C;;;;;OAKG;IACH,kBAAkB,CAAC,GAAG,EAAE,YAAY,GAAG,IAAI;IAM3C;;;;;;;OAOG;IACH,cAAc,CAAC,GAAG,EAAE,YAAY,GAAG,OAAO;IAe1C;;;;;;OAMG;IACG,QAAQ,CAAC,GAAG,EAAE,YAAY,GAAG,OAAO,CAAC,OAAO,CAAC;CA0BpD"}
+{"version":3,"file":"grid-field-edit-column.controller.d.ts","sourceRoot":"","sources":["../../../../../../src/controller/control/grid/grid-column/grid-field-edit-column/grid-field-edit-column.controller.ts"],"names":[],"mappings":"AAEA,OAAO,EAAoB,eAAe,EAAE,MAAM,kBAAkB,CAAC;AAGrE,OAAO,EACL,0BAA0B,EAC1B,iBAAiB,EACjB,eAAe,EAChB,MAAM,0BAA0B,CAAC;AAKlC,OAAO,EAAE,eAAe,EAAE,MAAM,sBAAsB,CAAC;AAEvD,OAAO,EAAE,YAAY,EAAE,MAAM,2BAA2B,CAAC;AACzD,OAAO,EAAE,yBAAyB,EAAE,MAAM,sBAAsB,CAAC;AAEjE;;;;;GAKG;AACH,qBAAa,6BACX,SAAQ,yBACR,YAAW,0BAA0B;IAErC;;;;;;OAMG;IACH,QAAQ,EAAG,eAAe,CAAC;IAE3B;;;;;;OAMG;IACH,MAAM,EAAG,iBAAiB,CAAC;IAE3B;;;;;;OAMG;IACH,cAAc,CAAC,EAAE,eAAe,CAAC;IAEjC;;;;;;OAMG;IACH,KAAK,EAAE,KAAK,EAAE,CAAM;IAEpB;;;;;;;OAOG;IACH,OAAO,CAAC,SAAS,CAAU;IAE3B;;;;;;OAMG;IACH,IAAI,QAAQ,IAAI,MAAM,GAAG,SAAS,CAEjC;IAED;;;;;;OAMG;IACH,IAAI,WAAW,IAAI,MAAM,GAAG,SAAS,CAEpC;IAED;;;;;;OAMG;IACH,IAAI,aAAa,IAAI,MAAM,GAAG,SAAS,CAKtC;IAED;;;;;;;OAOG;cACa,MAAM,IAAI,OAAO,CAAC,IAAI,CAAC;IAuBvC;;;;;;;OAOG;cACa,SAAS,IAAI,OAAO,CAAC,IAAI,CAAC;IAsB1C;;;;;;;;OAQG;IACG,WAAW,CACf,GAAG,EAAE,YAAY,EACjB,KAAK,EAAE,OAAO,EACd,IAAI,CAAC,EAAE,MAAM,GACZ,OAAO,CAAC,IAAI,CAAC;IAKhB;;;;;;;OAOG;IACG,gBAAgB,CAAC,GAAG,EAAE,YAAY,EAAE,KAAK,EAAE,MAAM,EAAE,GAAG,OAAO,CAAC,IAAI,CAAC;IAoDzE;;;;;OAKG;IACH,eAAe,CAAC,GAAG,EAAE,YAAY,EAAE,MAAM,EAAE,eAAe,GAAG,IAAI;IAMjE;;;;;OAKG;IACH,kBAAkB,CAAC,GAAG,EAAE,YAAY,GAAG,IAAI;IAiB3C;;;;;OAKG;IACH,kBAAkB,CAAC,GAAG,EAAE,YAAY,GAAG,IAAI;IAe3C;;;;;OAKG;IACH,kBAAkB,CAAC,GAAG,EAAE,YAAY,GAAG,IAAI;IAQ3C;;;;;;;OAOG;IACH,cAAc,CAAC,GAAG,EAAE,YAAY,GAAG,OAAO;IAe1C;;;;;;OAMG;IACG,QAAQ,CAAC,GAAG,EAAE,YAAY,GAAG,OAAO,CAAC,OAAO,CAAC;CA0BpD"}

package/out/controller/control/grid/grid-column/grid-field-edit-column/grid-field-edit-column.controller.js

@@ -223,7 +223,9 @@ export class GridFieldEditColumnController extends GridFieldColumnController {
         var _a;
         const isReadOnly = !!((_a = this.editItem.editor) === null || _a === void 0 ? void 0 : _a.readOnly);
         // 修改state
-        row.editColStates[this.fieldName].readonly = isReadOnly;
+        if (isReadOnly) {
+            row.editColStates[this.fieldName].readonly = isReadOnly;
+        }
     }
     /**
      * 计算启用项的禁用

package/out/controller/control/panel/panel/panel-item.controller.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"panel-item.controller.d.ts","sourceRoot":"","sources":["../../../../../src/controller/control/panel/panel/panel-item.controller.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,UAAU,EAAE,MAAM,kBAAkB,CAAC;AAC9C,OAAO,EACL,oBAAoB,EACpB,gBAAgB,EAChB,6BAA6B,EAC7B,eAAe,EAEhB,MAAM,uBAAuB,CAAC;AAG/B,OAAO,EAAE,gBAAgB,EAAE,MAAM,mBAAmB,CAAC;AACrD,OAAO,EAAE,cAAc,EAAE,MAAM,oBAAoB,CAAC;AAEpD,qBAAa,mBAAmB,CAAC,CAAC,SAAS,UAAU,GAAG,UAAU,CAChE,YAAW,oBAAoB;aAgEb,KAAK,EAAE,CAAC;aACR,KAAK,EAAE,gBAAgB;aACvB,MAAM,CAAC;IAhEzB;;;;;;OAMG;IACH,KAAK,EAAE,eAAe,CAAC;IAEvB;;;;;;OAMG;IACH,IAAI,UAAU,IAAI,gBAAgB,GAAG,6BAA6B,CAEjE;IAED;;;;;;OAMG;IACH,IAAI,IAAI,IAAI,KAAK,CAEhB;IAED;;;;;;OAMG;IACH,IAAI,cAAc,IAAI,MAAM,EAAE,CAE7B;IAED;;;;;;OAMG;IACH,IAAI,UAAU,IAAI,MAAM,EAAE,CAEzB;IAED;;;;;;;OAOG;gBAEe,KAAK,EAAE,CAAC,EACR,KAAK,EAAE,gBAAgB,EACvB,MAAM,CAAC,kCAAsB;IAK/C;;;;;;OAMG;IACG,IAAI,IAAI,OAAO,CAAC,IAAI,CAAC;cAUX,MAAM,IAAI,OAAO,CAAC,IAAI,CAAC;IA2BvC,OAAO,IAAI,IAAI;IAEf;;;;;;;OAOG;IACH,SAAS,CAAC,WAAW,IAAI,cAAc;IAIvC;;;;;;OAMG;IACG,gBAAgB,CAAC,KAAK,EAAE,MAAM,EAAE,GAAG,OAAO,CAAC,IAAI,CAAC;IAatD;;;;;OAKG;IACG,gBAAgB,CAAC,MAAM,EAAE,gBAAgB,GAAG,OAAO,CAAC,IAAI,CAAC;IAa/D;;;;;OAKG;IACH,gBAAgB,CAAC,IAAI,EAAE,KAAK,GAAG,IAAI;IAsBnC;;;;;OAKG;IACH,eAAe,CAAC,IAAI,EAAE,KAAK,GAAG,IAAI;IAsBlC;;;;;OAKG;IACH,gBAAgB,CAAC,IAAI,EAAE,KAAK,GAAG,IAAI;IAsBnC;;;;;OAKG;IACH,SAAS,CAAC,eAAe,EAAE;QACzB,OAAO,CAAC,EAAE,OAAO,CAAC;QAClB,QAAQ,CAAC,EAAE,OAAO,CAAC;QACnB,QAAQ,CAAC,EAAE,OAAO,CAAC;KACpB,CAIC;IAEF;;;;;;;;;;OAUG;IACH,SAAS,CAAC,gBAAgB,CAAC,KAAK,EAAE,MAAM,EAAE,EAAE,QAAQ,GAAE,OAAe,GAAG,IAAI;IAmC5E;;;;;;OAMG;IACH,cAAc,CACZ,KAAK,EAAE,oBAAoB,GAC1B,gBAAgB,GAAG,6BAA6B;IAWnD;;;;;OAKG;IACH,SAAS,CAAC,aAAa,CAAC,IAAI,EAAE,KAAK,GAAG,IAAI;IAe1C;;;;OAIG;IACH,OAAO,IAAI,IAAI;CAMhB"}
+{"version":3,"file":"panel-item.controller.d.ts","sourceRoot":"","sources":["../../../../../src/controller/control/panel/panel/panel-item.controller.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,UAAU,EAAE,MAAM,kBAAkB,CAAC;AAC9C,OAAO,EACL,oBAAoB,EACpB,gBAAgB,EAChB,6BAA6B,EAC7B,eAAe,EAEhB,MAAM,uBAAuB,CAAC;AAG/B,OAAO,EAAE,gBAAgB,EAAE,MAAM,mBAAmB,CAAC;AACrD,OAAO,EAAE,cAAc,EAAE,MAAM,oBAAoB,CAAC;AAEpD,qBAAa,mBAAmB,CAAC,CAAC,SAAS,UAAU,GAAG,UAAU,CAChE,YAAW,oBAAoB;aAgEb,KAAK,EAAE,CAAC;aACR,KAAK,EAAE,gBAAgB;aACvB,MAAM,CAAC;IAhEzB;;;;;;OAMG;IACH,KAAK,EAAE,eAAe,CAAC;IAEvB;;;;;;OAMG;IACH,IAAI,UAAU,IAAI,gBAAgB,GAAG,6BAA6B,CAEjE;IAED;;;;;;OAMG;IACH,IAAI,IAAI,IAAI,KAAK,CAEhB;IAED;;;;;;OAMG;IACH,IAAI,cAAc,IAAI,MAAM,EAAE,CAE7B;IAED;;;;;;OAMG;IACH,IAAI,UAAU,IAAI,MAAM,EAAE,CAEzB;IAED;;;;;;;OAOG;gBAEe,KAAK,EAAE,CAAC,EACR,KAAK,EAAE,gBAAgB,EACvB,MAAM,CAAC,kCAAsB;IAM/C;;;;;;OAMG;IACG,IAAI,IAAI,OAAO,CAAC,IAAI,CAAC;cAUX,MAAM,IAAI,OAAO,CAAC,IAAI,CAAC;IAoBvC,OAAO,IAAI,IAAI;IAEf;;;;;;;OAOG;IACH,SAAS,CAAC,WAAW,IAAI,cAAc;IAIvC;;;;;;OAMG;IACG,gBAAgB,CAAC,KAAK,EAAE,MAAM,EAAE,GAAG,OAAO,CAAC,IAAI,CAAC;IAatD;;;;;OAKG;IACG,gBAAgB,CAAC,MAAM,EAAE,gBAAgB,GAAG,OAAO,CAAC,IAAI,CAAC;IAa/D;;;;;OAKG;IACH,gBAAgB,CAAC,IAAI,EAAE,KAAK,GAAG,IAAI;IAsBnC;;;;;OAKG;IACH,eAAe,CAAC,IAAI,EAAE,KAAK,GAAG,IAAI;IAsBlC;;;;;OAKG;IACH,gBAAgB,CAAC,IAAI,EAAE,KAAK,GAAG,IAAI;IAsBnC;;;;;OAKG;IACH,SAAS,CAAC,eAAe,EAAE;QACzB,OAAO,CAAC,EAAE,OAAO,CAAC;QAClB,QAAQ,CAAC,EAAE,OAAO,CAAC;QACnB,QAAQ,CAAC,EAAE,OAAO,CAAC;KACpB,CAIC;IAEF;;;;;;;;;;OAUG;IACH,SAAS,CAAC,gBAAgB,CAAC,KAAK,EAAE,MAAM,EAAE,EAAE,QAAQ,GAAE,OAAe,GAAG,IAAI;IAmC5E;;;;;;OAMG;IACH,cAAc,CACZ,KAAK,EAAE,oBAAoB,GAC1B,gBAAgB,GAAG,6BAA6B;IAWnD;;;;;OAKG;IACH,SAAS,CAAC,aAAa,CAAC,IAAI,EAAE,KAAK,GAAG,IAAI;IAe1C;;;;OAIG;IACH,OAAO,IAAI,IAAI;CAMhB"}

package/out/controller/control/panel/panel/panel-item.controller.js

@@ -68,6 +68,7 @@ export class PanelItemController {
             required: undefined,
         };
         this.state = this.createState();
+        this.state.context = this.panel.context;
     }
     /**
      * 子类不可覆盖或重写此方法，在 init 时需要重写的使用 onInit 方法。
@@ -99,10 +100,6 @@ export class PanelItemController {
         if (labelSysCss === null || labelSysCss === void 0 ? void 0 : labelSysCss.cssName) {
             this.state.class.label.push(labelSysCss.cssName);
         }
-        if (this.panel.context.srfreadonly === true ||
-            this.panel.context.srfreadonly === 'true') {
-            this.state.readonly = true;
-        }
     }
     destroy() { }
     /**

package/out/controller/control/panel/panel/panel-item.state.d.ts

@@ -25,11 +25,19 @@ export declare class PanelItemState implements IPanelItemState {
     /**
      * 是否只读
      *
-     * @author zhanghengfeng
-     * @date 2024-03-25 17:03:36
+     * @author tony001
+     * @date 2024-04-16 16:04:49
      * @type {boolean}
      */
     readonly: boolean;
+    /**
+     * 上下文
+     *
+     * @author zhanghengfeng
+     * @date 2024-03-29 19:03:07
+     * @type {IContext}
+     */
+    context?: IContext;
     constructor(parent?: PanelItemState | undefined);
 }
 //# sourceMappingURL=panel-item.state.d.ts.map

package/out/controller/control/panel/panel/panel-item.state.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"panel-item.state.d.ts","sourceRoot":"","sources":["../../../../../src/controller/control/panel/panel/panel-item.state.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,eAAe,EACf,YAAY,EACZ,eAAe,EAChB,MAAM,uBAAuB,CAAC;AAE/B;;;;;;;GAOG;AACH,qBAAa,cAAe,YAAW,eAAe;IAwCxC,SAAS,CAAC,MAAM,CAAC;IAvCrB,OAAO,EAAE,OAAO,CAAC;IAEzB,QAAQ,EAAE,OAAO,CAAS;IAElB,SAAS,EAAE,OAAO,CAAC;IAE3B,MAAM,EAAE,YAAY,CAMlB;IAEF,KAAK,EAAE,eAAe,CAKpB;IAEF;;;;;;OAMG;IACH,QAAQ,EAAE,OAAO,CAAS;IAE1B;;;;;;OAMG;IACH,QAAQ,EAAE,OAAO,CAAS;gBAEJ,MAAM,CAAC,4BAAgB;CAqD9C"}
+{"version":3,"file":"panel-item.state.d.ts","sourceRoot":"","sources":["../../../../../src/controller/control/panel/panel/panel-item.state.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,eAAe,EACf,YAAY,EACZ,eAAe,EAChB,MAAM,uBAAuB,CAAC;AAE/B;;;;;;;GAOG;AACH,qBAAa,cAAe,YAAW,eAAe;IAiDxC,SAAS,CAAC,MAAM,CAAC;IAhDrB,OAAO,EAAE,OAAO,CAAC;IAEzB,QAAQ,EAAE,OAAO,CAAS;IAElB,SAAS,EAAE,OAAO,CAAC;IAE3B,MAAM,EAAE,YAAY,CAMlB;IAEF,KAAK,EAAE,eAAe,CAKpB;IAEF;;;;;;OAMG;IACH,QAAQ,EAAE,OAAO,CAAS;IAE1B;;;;;;OAMG;IACH,QAAQ,EAAE,OAAO,CAAS;IAE1B;;;;;;OAMG;IACH,OAAO,CAAC,EAAE,QAAQ,CAAC;gBAEG,MAAM,CAAC,4BAAgB;CAiE9C"}

package/out/controller/control/panel/panel/panel-item.state.js

@@ -34,8 +34,8 @@ export class PanelItemState {
         /**
          * 是否只读
          *
-         * @author zhanghengfeng
-         * @date 2024-03-25 17:03:36
+         * @author tony001
+         * @date 2024-04-16 16:04:49
          * @type {boolean}
          */
         this.readonly = false;
@@ -77,12 +77,22 @@ export class PanelItemState {
                 return true;
             },
         });
-        let $readonly = false;
+        // 定义只读状态
+        let $readonly;
         Object.defineProperty(this, 'readonly', {
             enumerable: true,
             configurable: true,
             get() {
-                return $readonly;
+                // 自身设置了值则只看自身
+                if ($readonly !== undefined) {
+                    return $readonly;
+                }
+                // 自身没有设置值，看父
+                if (this.context) {
+                    return !!(this.context.srfreadonly === true ||
+                        this.context.srfreadonly === 'true');
+                }
+                return false;
             },
             set(val) {
                 $readonly = val;

package/out/controller/control/panel/panel/panel.controller.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"panel.controller.d.ts","sourceRoot":"","sources":["../../../../../src/controller/control/panel/panel/panel.controller.ts"],"names":[],"mappings":"AAEA,OAAO,EACL,aAAa,EACb,MAAM,EAEN,UAAU,EAEX,MAAM,kBAAkB,CAAC;AAC1B,OAAO,EACL,WAAW,EACX,WAAW,EACX,gBAAgB,EAChB,oBAAoB,EACpB,kBAAkB,EAClB,gBAAgB,EAChB,6BAA6B,EAC7B,WAAW,EACZ,MAAM,uBAAuB,CAAC;AAG/B,OAAO,EAAE,SAAS,EAAE,MAAM,wBAAwB,CAAC;AACnD,OAAO,EAAE,iBAAiB,EAAE,MAAM,iBAAiB,CAAC;AACpD,OAAO,EAAE,gBAAgB,EAAE,MAAM,mBAAmB,CAAC;AACrD,OAAO,EAAE,eAAe,EAAE,MAAM,gBAAgB,CAAC;AACjD,OAAO,EAAE,GAAG,EAAE,MAAM,cAAc,CAAC;AAEnC;;;;;;;;GAQG;AACH,qBAAa,eAAe,CACxB,CAAC,SAAS,MAAM,GAAG,MAAM,EACzB,CAAC,SAAS,WAAW,GAAG,WAAW,EACnC,CAAC,SAAS,WAAW,GAAG,WAAW,CAErC,SAAQ,iBAAiB,CAAC,CAAC,EAAE,CAAC,EAAE,CAAC,CACjC,YAAW,gBAAgB,CAAC,CAAC,EAAE,CAAC,EAAE,CAAC,CAAC;IAEpC,SAAS,KAAK,IAAI,IAAI,eAAe,CAAC,WAAW,CAAC,CAEjD;IAED;;;;;;OAMG;IACH,UAAU,EAAE;QAAE,CAAC,GAAG,EAAE,MAAM,GAAG,oBAAoB,CAAA;KAAE,CAAM;IAEzD;;;;;;OAMG;IACH,SAAS,EAAE;QAAE,CAAC,GAAG,EAAE,MAAM,GAAG,kBAAkB,GAAG,gBAAgB,CAAA;KAAE,CAAM;IAEzE;;;;;;;OAOG;IACH,SAAS,EAAE,KAAK,GAAG,SAAS,CAAC;IAE7B,SAAS,CAAC,EAAE,WAAW,CAAC;IAExB;;;;;;;OAOG;IACH,IAAI,IAAI,IAAI,KAAK,CAEhB;gBAGC,KAAK,EAAE,CAAC,EACR,OAAO,EAAE,QAAQ,EACjB,MAAM,EAAE,OAAO,EACf,GAAG,EAAE,GAAG,EACR,SAAS,CAAC,EAAE,WAAW;IAMzB,SAAS,CAAC,SAAS,IAAI,IAAI;IAK3B,YAAY,CAAC,IAAI,EAAE,KAAK,GAAG,SAAS,GAAG,IAAI;IAI3C,OAAO,IAAI,KAAK,EAAE;cAIF,SAAS,IAAI,OAAO,CAAC,IAAI,CAAC;cAgB1B,SAAS,IAAI,OAAO,CAAC,IAAI,CAAC;cAI1B,WAAW,IAAI,OAAO,CAAC,IAAI,CAAC;IAQ5C;;;;;;OAMG;cACa,wBAAwB,CACtC,UAAU,GAAE,UAAU,EAAE,GAAG,SAAqC,EAChE,KAAK,GAAE,eAAsB,EAC7B,MAAM,GAAE,6BAA6B,GAAG,SAAqB,GAC5D,OAAO,CAAC,IAAI,CAAC;IAyChB;;;;;;OAMG;IACG,IAAI,IAAI,OAAO,CAAC,IAAI,CAAC;IAe3B;;;;;;;OAOG;IACG,WAAW,IAAI,OAAO,CAAC,KAAK,GAAG,SAAS,CAAC;IAiB/C;;;;;;;;OAQG;IACH,WAAW,CAAC,IAAI,EAAE,KAAK,GAAG,SAAS;IAcnC;;;;;;OAMG;IACH,gBAAgB,CAAC,KAAK,EAAE,MAAM,EAAE,GAAG,IAAI;IAMvC;;;;;OAKG;IACH,gBAAgB,CAAC,KAAK,EAAE,gBAAgB,GAAG,IAAI;IAM/C;;;;;OAKG;IACG,YAAY,CAAC,IAAI,EAAE,MAAM,EAAE,KAAK,EAAE,OAAO,GAAG,OAAO,CAAC,IAAI,CAAC;IAa/D,SAAS,CAAC,oBAAoB,CAAC,MAAM,GAAE,aAAa,EAAO,GAAG,IAAI;CAcnE"}
+{"version":3,"file":"panel.controller.d.ts","sourceRoot":"","sources":["../../../../../src/controller/control/panel/panel/panel.controller.ts"],"names":[],"mappings":"AAEA,OAAO,EACL,aAAa,EACb,MAAM,EAEN,UAAU,EAEX,MAAM,kBAAkB,CAAC;AAC1B,OAAO,EACL,WAAW,EACX,WAAW,EACX,gBAAgB,EAChB,oBAAoB,EACpB,kBAAkB,EAClB,gBAAgB,EAChB,6BAA6B,EAC7B,WAAW,EACZ,MAAM,uBAAuB,CAAC;AAG/B,OAAO,EAAE,SAAS,EAAE,MAAM,wBAAwB,CAAC;AACnD,OAAO,EAAE,iBAAiB,EAAE,MAAM,iBAAiB,CAAC;AACpD,OAAO,EAAE,gBAAgB,EAAE,MAAM,mBAAmB,CAAC;AACrD,OAAO,EAAE,eAAe,EAAE,MAAM,gBAAgB,CAAC;AACjD,OAAO,EAAE,GAAG,EAAE,MAAM,cAAc,CAAC;AAEnC;;;;;;;;GAQG;AACH,qBAAa,eAAe,CACxB,CAAC,SAAS,MAAM,GAAG,MAAM,EACzB,CAAC,SAAS,WAAW,GAAG,WAAW,EACnC,CAAC,SAAS,WAAW,GAAG,WAAW,CAErC,SAAQ,iBAAiB,CAAC,CAAC,EAAE,CAAC,EAAE,CAAC,CACjC,YAAW,gBAAgB,CAAC,CAAC,EAAE,CAAC,EAAE,CAAC,CAAC;IAEpC,SAAS,KAAK,IAAI,IAAI,eAAe,CAAC,WAAW,CAAC,CAEjD;IAED;;;;;;OAMG;IACH,UAAU,EAAE;QAAE,CAAC,GAAG,EAAE,MAAM,GAAG,oBAAoB,CAAA;KAAE,CAAM;IAEzD;;;;;;OAMG;IACH,SAAS,EAAE;QAAE,CAAC,GAAG,EAAE,MAAM,GAAG,kBAAkB,GAAG,gBAAgB,CAAA;KAAE,CAAM;IAEzE;;;;;;;OAOG;IACH,SAAS,EAAE,KAAK,GAAG,SAAS,CAAC;IAE7B,SAAS,CAAC,EAAE,WAAW,CAAC;IAExB;;;;;;;OAOG;IACH,IAAI,IAAI,IAAI,KAAK,CAEhB;gBAGC,KAAK,EAAE,CAAC,EACR,OAAO,EAAE,QAAQ,EACjB,MAAM,EAAE,OAAO,EACf,GAAG,EAAE,GAAG,EACR,SAAS,CAAC,EAAE,WAAW;IAMzB,SAAS,CAAC,SAAS,IAAI,IAAI;IAK3B,YAAY,CAAC,IAAI,EAAE,KAAK,GAAG,SAAS,GAAG,IAAI;IAI3C,OAAO,IAAI,KAAK,EAAE;cAIF,SAAS,IAAI,OAAO,CAAC,IAAI,CAAC;cAgB1B,SAAS,IAAI,OAAO,CAAC,IAAI,CAAC;cAI1B,WAAW,IAAI,OAAO,CAAC,IAAI,CAAC;IAQ5C;;;;;;OAMG;cACa,wBAAwB,CACtC,UAAU,GAAE,UAAU,EAAE,GAAG,SAAqC,EAChE,KAAK,GAAE,eAAsB,EAC7B,MAAM,GAAE,6BAA6B,GAAG,SAAqB,GAC5D,OAAO,CAAC,IAAI,CAAC;IA6ChB;;;;;;OAMG;IACG,IAAI,IAAI,OAAO,CAAC,IAAI,CAAC;IAe3B;;;;;;;OAOG;IACG,WAAW,IAAI,OAAO,CAAC,KAAK,GAAG,SAAS,CAAC;IAiB/C;;;;;;;;OAQG;IACH,WAAW,CAAC,IAAI,EAAE,KAAK,GAAG,SAAS;IAcnC;;;;;;OAMG;IACH,gBAAgB,CAAC,KAAK,EAAE,MAAM,EAAE,GAAG,IAAI;IAMvC;;;;;OAKG;IACH,gBAAgB,CAAC,KAAK,EAAE,gBAAgB,GAAG,IAAI;IAM/C;;;;;OAKG;IACG,YAAY,CAAC,IAAI,EAAE,MAAM,EAAE,KAAK,EAAE,OAAO,GAAG,OAAO,CAAC,IAAI,CAAC;IAa/D,SAAS,CAAC,oBAAoB,CAAC,MAAM,GAAE,aAAa,EAAO,GAAG,IAAI;CAcnE"}

package/out/controller/control/panel/panel/panel.controller.js

@@ -95,7 +95,7 @@ export class PanelController extends ControlController {
         await Promise.all(panelItems.map(async (panelItem) => {
             var _a, _b;
             // 生成面板成员控制器
-            const panelItemProvider = await getPanelItemProvider(panelItem);
+            const panelItemProvider = await getPanelItemProvider(panelItem, panel.model, panel.view.model);
             if (!panelItemProvider) {
                 return;
             }

package/out/controller/control/tab-exp-panel/tab-exp-panel.controller.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"tab-exp-panel.controller.d.ts","sourceRoot":"","sources":["../../../../src/controller/control/tab-exp-panel/tab-exp-panel.controller.ts"],"names":[],"mappings":"AAAA,OAAO,EAAU,eAAe,EAAE,YAAY,EAAE,MAAM,kBAAkB,CAAC;AAEzE,OAAO,EACL,iBAAiB,EACjB,iBAAiB,EACjB,sBAAsB,EAEtB,WAAW,EACZ,MAAM,oBAAoB,CAAC;AAG5B,OAAO,EAAE,iBAAiB,EAAE,MAAM,cAAc,CAAC;AAGjD;;;;;;;GAOG;AACH,qBAAa,qBACX,SAAQ,iBAAiB,CAAC,YAAY,EAAE,iBAAiB,EAAE,iBAAiB,CAC5E,YAAW,sBAAsB;IAEjC;;;;;OAKG;IACH,aAAa,UAAQ;IAErB;;;;;OAKG;IACH,UAAU,UAAS;IAEnB;;;;;;;;OAQG;IACH,IAAI,OAAO,IAAI,OAAO,CAQrB;IAED;;;;;;;;OAQG;IACH,IAAI,UAAU,IAAI,MAAM,GAAG,SAAS,CAEnC;IAED;;;;;OAKG;IACH,SAAS,CAAC,SAAS,IAAI,IAAI;IAO3B;;;;;;OAMG;IACG,SAAS,IAAI,OAAO,CAAC,IAAI,CAAC;IAQhC;;;;OAIG;IACH,YAAY,IAAI,IAAI;IAiBpB;;;;OAIG;IACH,eAAe,IAAI,IAAI;IAsBvB;;;;;;OAMG;IACH,eAAe,IAAI,IAAI;IAsBvB;;;;;;OAMG;IACH,SAAS,CAAC,WAAW,CACnB,GAAG,GAAE,eAA+C,EACpD,aAAa,UAAQ,GACpB,IAAI;IAQP;;;;;;;;OAQG;IACH,IAAI,uBAAuB,IAAI,eAAe,CAI7C;IAED;;;;OAIG;IACG,eAAe,IAAI,OAAO,CAAC,IAAI,CAAC;IAMtC;;;;;OAKG;IACH,aAAa,CAAC,YAAY,EAAE,eAAe,GAAG;QAC5C,OAAO,EAAE,QAAQ,CAAC;QAClB,MAAM,EAAE,OAAO,CAAC;KACjB;IA6BD;;;;;;;;OAQG;IACI,aAAa,CAAC,YAAY,EAAE,eAAe,GAAG,WAAW;IAYhE,OAAO,IAAI,IAAI;CAKhB"}
+{"version":3,"file":"tab-exp-panel.controller.d.ts","sourceRoot":"","sources":["../../../../src/controller/control/tab-exp-panel/tab-exp-panel.controller.ts"],"names":[],"mappings":"AAAA,OAAO,EAAU,eAAe,EAAE,YAAY,EAAE,MAAM,kBAAkB,CAAC;AAEzE,OAAO,EACL,iBAAiB,EACjB,iBAAiB,EACjB,sBAAsB,EAEtB,WAAW,EACZ,MAAM,oBAAoB,CAAC;AAG5B,OAAO,EAAE,iBAAiB,EAAE,MAAM,cAAc,CAAC;AAGjD;;;;;;;GAOG;AACH,qBAAa,qBACX,SAAQ,iBAAiB,CAAC,YAAY,EAAE,iBAAiB,EAAE,iBAAiB,CAC5E,YAAW,sBAAsB;IAEjC;;;;;OAKG;IACH,aAAa,UAAQ;IAErB;;;;;OAKG;IACH,UAAU,UAAS;IAEnB;;;;;;;;OAQG;IACH,IAAI,OAAO,IAAI,OAAO,CAQrB;IAED;;;;;;;;OAQG;IACH,IAAI,UAAU,IAAI,MAAM,GAAG,SAAS,CAEnC;IAED;;;;;OAKG;IACH,SAAS,CAAC,SAAS,IAAI,IAAI;IAO3B;;;;;;OAMG;IACG,SAAS,IAAI,OAAO,CAAC,IAAI,CAAC;IAQhC;;;;OAIG;IACH,YAAY,IAAI,IAAI;IAiBpB;;;;OAIG;IACH,eAAe,IAAI,IAAI;IAsBvB;;;;;;OAMG;IACH,eAAe,IAAI,IAAI;IAsBvB;;;;;;OAMG;IACH,SAAS,CAAC,WAAW,CACnB,GAAG,GAAE,eAA+C,EACpD,aAAa,UAAQ,GACpB,IAAI;IASP;;;;;;;;OAQG;IACH,IAAI,uBAAuB,IAAI,eAAe,CAI7C;IAED;;;;OAIG;IACG,eAAe,IAAI,OAAO,CAAC,IAAI,CAAC;IAMtC;;;;;OAKG;IACH,aAAa,CAAC,YAAY,EAAE,eAAe,GAAG;QAC5C,OAAO,EAAE,QAAQ,CAAC;QAClB,MAAM,EAAE,OAAO,CAAC;KACjB;IA6BD;;;;;;;;OAQG;IACI,aAAa,CAAC,YAAY,EAAE,eAAe,GAAG,WAAW;IAYhE,OAAO,IAAI,IAAI;CAKhB"}

package/out/controller/control/tab-exp-panel/tab-exp-panel.controller.js

@@ -167,6 +167,7 @@ export class TabExpPanelController extends ControlController {
             navViewMsg.isRoutePushed = true;
         }
         this.evt.emit('onNavViewChange', { navViewMsg });
+        this.evt.emit('onTabChange', { tab });
     }
     /**
      * 当前激活tab模型

package/out/controller/utils/data-file-util/data-file-util.d.ts

@@ -1,8 +1,17 @@
 import { IAppDEDataImport, IAppDataEntity } from '@ibiz/model-core';
 export type ImportDataResult = {
-    total: number;
-    success: number;
+    /**
+     * 是否是异步导入
+     */
+    isAsync?: boolean;
+    /**
+     * 是否取消
+     */
+    cancel?: boolean;
+    total?: number;
+    success?: number;
     message?: string;
+    errorMessage?: string;
 };
 export type IExportDataResult = {
     ok: boolean;
@@ -30,6 +39,26 @@ export declare function asyncImportData(file: File, appDataEntity: IAppDataEntit
  * @return {*}  {Promise<IData>}
  */
 export declare function importData(file: File, appDataEntity: IAppDataEntity, dataImport?: IAppDEDataImport, context?: IContext): Promise<ImportDataResult>;
+/**
+ * 新的导入，异步导入和同步导入内部判断
+ * 异步导入不等待，同步等待结果后返回
+ * @author lxm
+ * @date 2024-04-16 03:34:56
+ * @export
+ * @param {{
+ *   selectedFile: File;
+ *   appDataEntity: IAppDataEntity;
+ *   dataImport?: IAppDEDataImport;
+ *   context?: IContext;
+ * }} opts
+ * @return {*}  {Promise<ImportDataResult>}
+ */
+export declare function importData2(opts: {
+    selectedFile: File;
+    appDataEntity: IAppDataEntity;
+    dataImport?: IAppDEDataImport;
+    context?: IContext;
+}): Promise<ImportDataResult>;
 /**
  * 标准导出方法
  *
@@ -42,4 +71,68 @@ export declare function importData(file: File, appDataEntity: IAppDataEntity, da
  * @return {*}  {Promise<IExportDataResult>}
  */
 export declare function exportData(header: string[], data: IData[][], fileName: string): Promise<IExportDataResult>;
+/**
+ * 获取导入相关模型
+ * @author lxm
+ * @date 2024-04-15 04:54:29
+ * @export
+ * @param {{
+ *   deDataImportId: string;
+ *   appDataEntityId: string;
+ *   appId?: string;
+ * }} opts
+ * @return {*}  {Promise<{ dataImport: IAppDEDataImport; appDataEntity: IAppDataEntity }>}
+ */
+export declare function getDataImportModels(opts: {
+    deDataImportId: string;
+    appDataEntityId: string;
+    appId?: string;
+}): Promise<{
+    deDataImport: IAppDEDataImport;
+    appDataEntity: IAppDataEntity;
+}>;
+/**
+ * 打开数据导入界面
+ * @author lxm
+ * @date 2024-04-15 01:51:20
+ * @export
+ * @param {{
+ *   deDataImportId: string;
+ *   appDataEntityId: string;
+ *   dataImportViewId?: string;
+ *   context: IContext;
+ *   params: IParams;
+ * }} opts
+ * @return {*}  {Promise<void>}
+ */
+export declare function openDataImport(opts: {
+    deDataImportId: string;
+    appDataEntityId: string;
+    dataImportViewId?: string;
+    context: IContext;
+    params: IParams;
+}): Promise<void>;
+/**
+ * 下载导入模版文件
+ * @author lxm
+ * @date 2024-04-15 05:49:53
+ * @export
+ * @param {IAppDataEntity} appDataEntity
+ * @param {IAppDEDataImport} dataImport
+ * @return {*}  {Promise<void>}
+ */
+export declare function downloadImportTemplate(appDataEntity: IAppDataEntity, dataImport?: IAppDEDataImport): Promise<void>;
+/**
+ * 选择文件并导入
+ * @author lxm
+ * @date 2024-04-16 02:31:24
+ * @export
+ * @param {{}} opts
+ * @return {*}  {Promise<void>}
+ */
+export declare function selectAndImport(opts: {
+    appDataEntity: IAppDataEntity;
+    dataImport?: IAppDEDataImport;
+    context?: IContext;
+}): Promise<ImportDataResult>;
 //# sourceMappingURL=data-file-util.d.ts.map

package/out/controller/utils/data-file-util/data-file-util.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"data-file-util.d.ts","sourceRoot":"","sources":["../../../../src/controller/utils/data-file-util/data-file-util.ts"],"names":[],"mappings":"AAKA,OAAO,EAAE,gBAAgB,EAAE,cAAc,EAAE,MAAM,kBAAkB,CAAC;AAUpE,MAAM,MAAM,gBAAgB,GAAG;IAC7B,KAAK,EAAE,MAAM,CAAC;IACd,OAAO,EAAE,MAAM,CAAC;IAChB,OAAO,CAAC,EAAE,MAAM,CAAC;CAClB,CAAC;AAEF,MAAM,MAAM,iBAAiB,GAAG;IAE9B,EAAE,EAAE,OAAO,CAAC;IAEZ,GAAG,CAAC,EAAE,MAAM,CAAC;CACd,CAAC;AA6BF;;;;;;;;;GASG;AACH,wBAAsB,eAAe,CACnC,IAAI,EAAE,IAAI,EACV,aAAa,EAAE,cAAc,EAC7B,UAAU,CAAC,EAAE,gBAAgB,EAC7B,OAAO,CAAC,EAAE,QAAQ,GACjB,OAAO,CAAC,IAAI,CAAC,CAuBf;AAED;;;;;;;;;GASG;AACH,wBAAsB,UAAU,CAC9B,IAAI,EAAE,IAAI,EACV,aAAa,EAAE,cAAc,EAC7B,UAAU,CAAC,EAAE,gBAAgB,EAC7B,OAAO,CAAC,EAAE,QAAQ,GACjB,OAAO,CAAC,gBAAgB,CAAC,CAkB3B;AAED;;;;;;;;;;GAUG;AACH,wBAAsB,UAAU,CAC9B,MAAM,EAAE,MAAM,EAAE,EAChB,IAAI,EAAE,KAAK,EAAE,EAAE,EACf,QAAQ,EAAE,MAAM,GACf,OAAO,CAAC,iBAAiB,CAAC,CAmB5B"}
+{"version":3,"file":"data-file-util.d.ts","sourceRoot":"","sources":["../../../../src/controller/utils/data-file-util/data-file-util.ts"],"names":[],"mappings":"AAMA,OAAO,EAAE,gBAAgB,EAAE,cAAc,EAAE,MAAM,kBAAkB,CAAC;AAYpE,MAAM,MAAM,gBAAgB,GAAG;IAC7B;;OAEG;IACH,OAAO,CAAC,EAAE,OAAO,CAAC;IAClB;;OAEG;IACH,MAAM,CAAC,EAAE,OAAO,CAAC;IAEjB,KAAK,CAAC,EAAE,MAAM,CAAC;IACf,OAAO,CAAC,EAAE,MAAM,CAAC;IACjB,OAAO,CAAC,EAAE,MAAM,CAAC;IACjB,YAAY,CAAC,EAAE,MAAM,CAAC;CACvB,CAAC;AAGF,MAAM,MAAM,iBAAiB,GAAG;IAE9B,EAAE,EAAE,OAAO,CAAC;IAEZ,GAAG,CAAC,EAAE,MAAM,CAAC;CACd,CAAC;AA6BF;;;;;;;;;GASG;AACH,wBAAsB,eAAe,CACnC,IAAI,EAAE,IAAI,EACV,aAAa,EAAE,cAAc,EAC7B,UAAU,CAAC,EAAE,gBAAgB,EAC7B,OAAO,CAAC,EAAE,QAAQ,GACjB,OAAO,CAAC,IAAI,CAAC,CA4Bf;AAED;;;;;;;;;GASG;AACH,wBAAsB,UAAU,CAC9B,IAAI,EAAE,IAAI,EACV,aAAa,EAAE,cAAc,EAC7B,UAAU,CAAC,EAAE,gBAAgB,EAC7B,OAAO,CAAC,EAAE,QAAQ,GACjB,OAAO,CAAC,gBAAgB,CAAC,CAqC3B;AAED;;;;;;;;;;;;;GAaG;AACH,wBAAsB,WAAW,CAAC,IAAI,EAAE;IACtC,YAAY,EAAE,IAAI,CAAC;IACnB,aAAa,EAAE,cAAc,CAAC;IAC9B,UAAU,CAAC,EAAE,gBAAgB,CAAC;IAC9B,OAAO,CAAC,EAAE,QAAQ,CAAC;CACpB,GAAG,OAAO,CAAC,gBAAgB,CAAC,CAwB5B;AAED;;;;;;;;;;GAUG;AACH,wBAAsB,UAAU,CAC9B,MAAM,EAAE,MAAM,EAAE,EAChB,IAAI,EAAE,KAAK,EAAE,EAAE,EACf,QAAQ,EAAE,MAAM,GACf,OAAO,CAAC,iBAAiB,CAAC,CAmB5B;AAED;;;;;;;;;;;GAWG;AACH,wBAAsB,mBAAmB,CAAC,IAAI,EAAE;IAC9C,cAAc,EAAE,MAAM,CAAC;IACvB,eAAe,EAAE,MAAM,CAAC;IACxB,KAAK,CAAC,EAAE,MAAM,CAAC;CAChB,GAAG,OAAO,CAAC;IAAE,YAAY,EAAE,gBAAgB,CAAC;IAAC,aAAa,EAAE,cAAc,CAAA;CAAE,CAAC,CAY7E;AAED;;;;;;;;;;;;;GAaG;AACH,wBAAsB,cAAc,CAAC,IAAI,EAAE;IACzC,cAAc,EAAE,MAAM,CAAC;IACvB,eAAe,EAAE,MAAM,CAAC;IACxB,gBAAgB,CAAC,EAAE,MAAM,CAAC;IAC1B,OAAO,EAAE,QAAQ,CAAC;IAClB,MAAM,EAAE,OAAO,CAAC;CACjB,GAAG,OAAO,CAAC,IAAI,CAAC,CAoDhB;AAED;;;;;;;;GAQG;AACH,wBAAsB,sBAAsB,CAC1C,aAAa,EAAE,cAAc,EAC7B,UAAU,CAAC,EAAE,gBAAgB,GAC5B,OAAO,CAAC,IAAI,CAAC,CA0Bf;AAED;;;;;;;GAOG;AACH,wBAAsB,eAAe,CAAC,IAAI,EAAE;IAC1C,aAAa,EAAE,cAAc,CAAC;IAC9B,UAAU,CAAC,EAAE,gBAAgB,CAAC;IAC9B,OAAO,CAAC,EAAE,QAAQ,CAAC;CACpB,GAAG,OAAO,CAAC,gBAAgB,CAAC,CAmB5B"}

package/out/controller/utils/data-file-util/data-file-util.js

@@ -1,5 +1,6 @@
-import { RuntimeError, } from '@ibiz-template/core';
+import { RuntimeError, selectFile, } from '@ibiz-template/core';
 import { calcResPath } from '../../../service';
+import { OpenAppViewCommand } from '../../../command';
 // 异步导入URL
 const asyncImportUrl = 'asyncimportdata2';
 // 标准导入url
@@ -41,6 +42,10 @@ function listenAsyncAction(id) {
  * @return {*}  {Promise<IData>}
  */
 export async function asyncImportData(file, appDataEntity, dataImport, context) {
+    // 异步导入开始的提示
+    ibiz.notification.info({
+        desc: ibiz.i18n.t('component.dataImport.startImport'),
+    });
     const data = new FormData();
     data.append('file', file);
     let url = `/${appDataEntity.deapicodeName2}/${asyncImportUrl}`;
@@ -81,13 +86,54 @@ export async function importData(file, appDataEntity, dataImport, context) {
         const resPath = calcResPath(context, appDataEntity);
         url = resPath + url;
     }
-    const res = await ibiz.net.request(url, {
-        method: 'post',
-        data,
-        headers: { 'Content-Type': 'multipart/form-data' },
-    });
-    // 错误情况 服务层会抛出异常
-    return res.data;
+    const result = {
+        isAsync: false,
+    };
+    try {
+        const res = await ibiz.net.request(url, {
+            method: 'post',
+            data,
+            headers: { 'Content-Type': 'multipart/form-data' },
+        });
+        // 模拟表单通知 刷新表格
+        ibiz.mc.command.send({ srfdecodename: appDataEntity.codeName }, 'OBJECTCREATED', 'DATAIMPORT');
+        Object.assign(result, res.data);
+    }
+    catch (error) {
+        if (error instanceof Error) {
+            result.errorMessage = error.message;
+        }
+    }
+    return result;
+}
+/**
+ * 新的导入，异步导入和同步导入内部判断
+ * 异步导入不等待，同步等待结果后返回
+ * @author lxm
+ * @date 2024-04-16 03:34:56
+ * @export
+ * @param {{
+ *   selectedFile: File;
+ *   appDataEntity: IAppDataEntity;
+ *   dataImport?: IAppDEDataImport;
+ *   context?: IContext;
+ * }} opts
+ * @return {*}  {Promise<ImportDataResult>}
+ */
+export async function importData2(opts) {
+    const result = {
+        isAsync: ibiz.env.enableMqtt,
+    };
+    if (ibiz.env.enableMqtt) {
+        // 异步导入不需要等待
+        asyncImportData(opts.selectedFile, opts.appDataEntity, opts.dataImport, opts.context);
+    }
+    else {
+        // 默认同步导入，返回结果
+        const temp = await importData(opts.selectedFile, opts.appDataEntity, opts.dataImport, opts.context);
+        Object.assign(result, temp);
+    }
+    return result;
 }
 /**
  * 标准导出方法
@@ -121,3 +167,143 @@ export async function exportData(header, data, fileName) {
         return { ok: false };
     }
 }
+/**
+ * 获取导入相关模型
+ * @author lxm
+ * @date 2024-04-15 04:54:29
+ * @export
+ * @param {{
+ *   deDataImportId: string;
+ *   appDataEntityId: string;
+ *   appId?: string;
+ * }} opts
+ * @return {*}  {Promise<{ dataImport: IAppDEDataImport; appDataEntity: IAppDataEntity }>}
+ */
+export async function getDataImportModels(opts) {
+    var _a;
+    const appDataEntity = await ibiz.hub.getAppDataEntity(opts.appDataEntityId, opts.appId);
+    const deDataImport = (_a = appDataEntity.appDEDataImports) === null || _a === void 0 ? void 0 : _a.find(item => item.id === opts.deDataImportId);
+    if (!deDataImport) {
+        throw new RuntimeError('没有找到对应的导入数据模型');
+    }
+    return { deDataImport, appDataEntity };
+}
+/**
+ * 打开数据导入界面
+ * @author lxm
+ * @date 2024-04-15 01:51:20
+ * @export
+ * @param {{
+ *   deDataImportId: string;
+ *   appDataEntityId: string;
+ *   dataImportViewId?: string;
+ *   context: IContext;
+ *   params: IParams;
+ * }} opts
+ * @return {*}  {Promise<void>}
+ */
+export async function openDataImport(opts) {
+    const { deDataImportId, appDataEntityId, context, params } = opts;
+    const viewId = opts.dataImportViewId || 'AppDataUploadView';
+    let view = null;
+    // 没有指定视图的时候，可能会拿不到默认视图
+    try {
+        view = await ibiz.hub.config.view.get(viewId);
+    }
+    catch (error) {
+        if (opts.dataImportViewId) {
+            // 指定了视图id找不到就报错
+            throw error;
+        }
+    }
+    if (view) {
+        context.srfappdataentityid = appDataEntityId;
+        context.srfdedataimportid = deDataImportId;
+        // 走导入视图
+        return ibiz.commands.execute(OpenAppViewCommand.TAG, view.id, context, params, { openMode: 'POPUPMODAL' });
+    }
+    // 走自定义组件的导入
+    const { deDataImport, appDataEntity } = await getDataImportModels({
+        deDataImportId,
+        appDataEntityId,
+        appId: context.srfappid,
+    });
+    const importComponentName = deDataImport.enableCustomized
+        ? 'DataImport2'
+        : 'DataImport';
+    const modal = ibiz.overlay.createModal(importComponentName, {
+        dismiss: () => modal.dismiss(),
+        dataImport: deDataImport,
+        appDataEntity,
+        context,
+        params,
+    }, {
+        width: 'auto',
+        placement: 'center',
+    });
+    modal.present();
+    await modal.onWillDismiss();
+}
+/**
+ * 下载导入模版文件
+ * @author lxm
+ * @date 2024-04-15 05:49:53
+ * @export
+ * @param {IAppDataEntity} appDataEntity
+ * @param {IAppDEDataImport} dataImport
+ * @return {*}  {Promise<void>}
+ */
+export async function downloadImportTemplate(appDataEntity, dataImport) {
+    var _a;
+    let templateUrl = `${appDataEntity.codeName2.toLowerCase()}/importtemplate`;
+    if (dataImport === null || dataImport === void 0 ? void 0 : dataImport.codeName) {
+        templateUrl += `?srfimporttag=${dataImport.codeName}`;
+    }
+    const res = await ibiz.net.request(templateUrl, {
+        responseType: 'blob',
+    });
+    if (res.status === 200) {
+        let fileName = ((_a = res.headers['content-disposition'].split(';')
+            .find((str) => str.indexOf('filename=') !== -1)) === null || _a === void 0 ? void 0 : _a.slice(9)) || '';
+        fileName = decodeURIComponent(fileName);
+        const blob = new Blob([res.data], {
+            type: 'application/vnd.ms-excel',
+        });
+        const elink = document.createElement('a');
+        elink.download = fileName;
+        elink.style.display = 'none';
+        elink.href = URL.createObjectURL(blob);
+        document.body.appendChild(elink);
+        elink.click();
+        URL.revokeObjectURL(elink.href); // 释放URL 对象
+        document.body.removeChild(elink);
+    }
+}
+/**
+ * 选择文件并导入
+ * @author lxm
+ * @date 2024-04-16 02:31:24
+ * @export
+ * @param {{}} opts
+ * @return {*}  {Promise<void>}
+ */
+export async function selectAndImport(opts) {
+    return new Promise(resolve => {
+        selectFile({
+            accept: '.xlsx, .xls',
+            multiple: false,
+            onSelected: async (files) => {
+                const result = await importData2({
+                    selectedFile: files[0],
+                    appDataEntity: opts.appDataEntity,
+                    dataImport: opts.dataImport,
+                    context: opts.context,
+                });
+                resolve(result);
+            },
+            onCancel: () => {
+                resolve({ cancel: true });
+            },
+        });
+    });
+}

package/out/controller/utils/value-rule/value-rule.js

@@ -23,7 +23,7 @@ export function generateRules(itemVRs, name, valueItemName) {
         // 系统值规则
         if (valueRuleType === 'SYSVALUERULE' && sysRule) {
             // 正则值规则
-            if (sysRule.ruleType === 'REG') {
+            if (sysRule.ruleType === 'REG' || sysRule.ruleType === 'REGEX') {
                 rules.push({
                     pattern: new RegExp(sysRule.regExCode),
                     message: sysRule.ruleInfo,

package/out/hub/config/app-view-config-service.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"app-view-config-service.d.ts","sourceRoot":"","sources":["../../../src/hub/config/app-view-config-service.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,QAAQ,EAAE,MAAM,kBAAkB,CAAC;AAC5C,OAAO,EAAE,qBAAqB,EAAE,WAAW,EAAE,MAAM,iBAAiB,CAAC;AAErE;;;;;;;;GAQG;AACH,qBAAa,oBAAqB,YAAW,qBAAqB;IAChE;;;;OAIG;IACH,SAAS,CAAC,WAAW,2BAAkC;IAEvD;;;;;;;;OAQG;IACH,SAAS,CAAC,aAAa,CAAC,GAAG,EAAE,MAAM,GAAG,MAAM;IAW5C;;;;;;;;;OASG;IACH,SAAS,CAAC,eAAe,CAAC,KAAK,EAAE,QAAQ,GAAG;QAAE,WAAW,EAAE,KAAK,CAAA;KAAE;IAiBlE,GAAG,CAAC,GAAG,EAAE,MAAM,GAAG,OAAO;IAKzB,GAAG,CAAC,GAAG,EAAE,MAAM,EAAE,UAAU,EAAE,WAAW,GAAG,IAAI;IAKzC,GAAG,CAAC,GAAG,EAAE,MAAM,GAAG,OAAO,CAAC,WAAW,CAAC;IAyB5C,OAAO,CAAC,GAAG,EAAE,MAAM,GAAG,WAAW,GAAG,IAAI;CAMzC"}
+{"version":3,"file":"app-view-config-service.d.ts","sourceRoot":"","sources":["../../../src/hub/config/app-view-config-service.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,QAAQ,EAAE,MAAM,kBAAkB,CAAC;AAC5C,OAAO,EAAE,qBAAqB,EAAE,WAAW,EAAE,MAAM,iBAAiB,CAAC;AAErE;;;;;;;;GAQG;AACH,qBAAa,oBAAqB,YAAW,qBAAqB;IAChE;;;;OAIG;IACH,SAAS,CAAC,WAAW,2BAAkC;IAEvD;;;;;;;;OAQG;IACH,SAAS,CAAC,aAAa,CAAC,GAAG,EAAE,MAAM,GAAG,MAAM;IAW5C;;;;;;;;;OASG;IACH,SAAS,CAAC,eAAe,CAAC,KAAK,EAAE,QAAQ,GAAG;QAAE,WAAW,EAAE,KAAK,CAAA;KAAE;IAwBlE,GAAG,CAAC,GAAG,EAAE,MAAM,GAAG,OAAO;IAKzB,GAAG,CAAC,GAAG,EAAE,MAAM,EAAE,UAAU,EAAE,WAAW,GAAG,IAAI;IAKzC,GAAG,CAAC,GAAG,EAAE,MAAM,GAAG,OAAO,CAAC,WAAW,CAAC;IAyB5C,OAAO,CAAC,GAAG,EAAE,MAAM,GAAG,WAAW,GAAG,IAAI;CAMzC"}

package/out/hub/config/app-view-config-service.js

@@ -49,9 +49,14 @@ export class AppViewConfigService {
      */
     getCustomOption(model) {
         var _a;
-        const { appViewParams } = model;
+        const { appViewParams, userParam } = model;
         // 解析ModalOption参数
-        const optionProperty = (_a = appViewParams === null || appViewParams === void 0 ? void 0 : appViewParams.find(item => item.id === 'modaloption')) === null || _a === void 0 ? void 0 : _a.value;
+        let optionProperty = (_a = appViewParams === null || appViewParams === void 0 ? void 0 : appViewParams.find(item => item.id === 'modaloption')) === null || _a === void 0 ? void 0 : _a.value;
+        // 应用功能视图没有viewParams，从userParam中获取modalOption
+        if (!optionProperty && userParam) {
+            // 解析ModalOption参数
+            optionProperty = userParam.modalOption;
+        }
         let modalOption = {};
         if (optionProperty) {
             try {

package/out/interface/common/i-global-config/i-global-config.d.ts

@@ -3,6 +3,7 @@ import { IGlobalGridConfig } from './i-global-grid-config';
 import { IGlobalAppMenuConfig } from './i-global-app-menu-config';
 import { IGlobalViewConfig } from './i-global-view-config';
 import { IGlobalFormConfig } from './i-global-form-config';
+import { IGlobalPickerEditorConfig } from './i-global-picker-editor-config';
 /**
  * 全局配置类,控制应用的功能开关。
  *
@@ -51,5 +52,13 @@ export interface IGlobalConfig {
      * @type {IGlobalFormConfig}
      */
     form: IGlobalFormConfig;
+    /**
+     * 全局下拉选择类编辑器配置
+     *
+     * @author zhanghengfeng
+     * @date 2024-04-15 18:04:52
+     * @type {IGlobalPickerEditorConfig}
+     */
+    pickerEditor: IGlobalPickerEditorConfig;
 }
 //# sourceMappingURL=i-global-config.d.ts.map

package/out/interface/common/i-global-config/i-global-config.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"i-global-config.d.ts","sourceRoot":"","sources":["../../../../src/interface/common/i-global-config/i-global-config.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,qBAAqB,EAAE,MAAM,4BAA4B,CAAC;AACnE,OAAO,EAAE,iBAAiB,EAAE,MAAM,wBAAwB,CAAC;AAC3D,OAAO,EAAE,oBAAoB,EAAE,MAAM,4BAA4B,CAAC;AAClE,OAAO,EAAE,iBAAiB,EAAE,MAAM,wBAAwB,CAAC;AAC3D,OAAO,EAAE,iBAAiB,EAAE,MAAM,wBAAwB,CAAC;AAE3D;;;;;;;GAOG;AACH,MAAM,WAAW,aAAa;IAC5B;;;;;;OAMG;IACH,KAAK,CAAC,EAAE,MAAM,CAAC;IAEf;;;;OAIG;IACH,IAAI,EAAE,iBAAiB,CAAC;IAExB;;;;OAIG;IACH,IAAI,EAAE,iBAAiB,CAAC;IAExB;;;;OAIG;IACH,OAAO,EAAE,oBAAoB,CAAC;IAE9B;;;;OAIG;IACH,QAAQ,EAAE,qBAAqB,CAAC;IAEhC;;;;;OAKG;IACH,IAAI,EAAE,iBAAiB,CAAC;CACzB"}
+{"version":3,"file":"i-global-config.d.ts","sourceRoot":"","sources":["../../../../src/interface/common/i-global-config/i-global-config.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,qBAAqB,EAAE,MAAM,4BAA4B,CAAC;AACnE,OAAO,EAAE,iBAAiB,EAAE,MAAM,wBAAwB,CAAC;AAC3D,OAAO,EAAE,oBAAoB,EAAE,MAAM,4BAA4B,CAAC;AAClE,OAAO,EAAE,iBAAiB,EAAE,MAAM,wBAAwB,CAAC;AAC3D,OAAO,EAAE,iBAAiB,EAAE,MAAM,wBAAwB,CAAC;AAC3D,OAAO,EAAE,yBAAyB,EAAE,MAAM,iCAAiC,CAAC;AAE5E;;;;;;;GAOG;AACH,MAAM,WAAW,aAAa;IAC5B;;;;;;OAMG;IACH,KAAK,CAAC,EAAE,MAAM,CAAC;IAEf;;;;OAIG;IACH,IAAI,EAAE,iBAAiB,CAAC;IAExB;;;;OAIG;IACH,IAAI,EAAE,iBAAiB,CAAC;IAExB;;;;OAIG;IACH,OAAO,EAAE,oBAAoB,CAAC;IAE9B;;;;OAIG;IACH,QAAQ,EAAE,qBAAqB,CAAC;IAEhC;;;;;OAKG;IACH,IAAI,EAAE,iBAAiB,CAAC;IAExB;;;;;;OAMG;IACH,YAAY,EAAE,yBAAyB,CAAC;CACzC"}

package/out/interface/common/i-global-config/i-global-picker-editor-config.d.ts

@@ -0,0 +1,13 @@
+export interface IGlobalPickerEditorConfig {
+    /**
+     * 宽度模式
+     * - auto 宽度自动延长，默认模式
+     * - ellipsis 内容超出时出省略号，鼠标悬浮出现tooltip提示
+     *
+     * @author zhanghengfeng
+     * @date 2024-04-15 18:04:21
+     * @type {('auto' | 'ellipsis')}
+     */
+    overflowMode: 'auto' | 'ellipsis';
+}
+//# sourceMappingURL=i-global-picker-editor-config.d.ts.map

package/out/interface/common/i-global-config/i-global-picker-editor-config.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"i-global-picker-editor-config.d.ts","sourceRoot":"","sources":["../../../../src/interface/common/i-global-config/i-global-picker-editor-config.ts"],"names":[],"mappings":"AAAA,MAAM,WAAW,yBAAyB;IACxC;;;;;;;;OAQG;IACH,YAAY,EAAE,MAAM,GAAG,UAAU,CAAC;CACnC"}

package/out/interface/common/i-global-config/i-global-picker-editor-config.js

@@ -0,0 +1 @@
+export {};

package/out/interface/common/i-global-config/index.d.ts

@@ -4,4 +4,5 @@ export * from './i-global-grid-config';
 export * from './i-global-app-menu-config';
 export * from './i-global-view-config';
 export * from './i-global-form-config';
+export * from './i-global-picker-editor-config';
 //# sourceMappingURL=index.d.ts.map

package/out/interface/common/i-global-config/index.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../../src/interface/common/i-global-config/index.ts"],"names":[],"mappings":"AAAA,cAAc,4BAA4B,CAAC;AAC3C,cAAc,mBAAmB,CAAC;AAClC,cAAc,wBAAwB,CAAC;AACvC,cAAc,4BAA4B,CAAC;AAC3C,cAAc,wBAAwB,CAAC;AACvC,cAAc,wBAAwB,CAAC"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../../src/interface/common/i-global-config/index.ts"],"names":[],"mappings":"AAAA,cAAc,4BAA4B,CAAC;AAC3C,cAAc,mBAAmB,CAAC;AAClC,cAAc,wBAAwB,CAAC;AACvC,cAAc,4BAA4B,CAAC;AAC3C,cAAc,wBAAwB,CAAC;AACvC,cAAc,wBAAwB,CAAC;AACvC,cAAc,iCAAiC,CAAC"}