@ibiz-template/runtime 0.7.1 → 0.7.3

package/out/interface/controller/state/view/i-app-data-upload-view.state.d.ts

@@ -0,0 +1,26 @@
+import { IAppDEDataImport, IAppDataEntity } from '@ibiz/model-core';
+import { IViewState } from './i-view.state';
+/**
+ * 应用数据导入视图UI状态
+ *
+ * @export
+ * @class IAppDataUploadViewState
+ * @extends {IViewState}
+ */
+export interface IAppDataUploadViewState extends IViewState {
+    /**
+     * 实体模型
+     * @author lxm
+     * @date 2024-04-15 05:18:15
+     * @type {IAppDataEntity}
+     */
+    appDataEntity: IAppDataEntity;
+    /**
+     * 实体导入模型
+     * @author lxm
+     * @date 2024-04-15 05:18:56
+     * @type {IAppDEDataImport}
+     */
+    deDataImport: IAppDEDataImport;
+}
+//# sourceMappingURL=i-app-data-upload-view.state.d.ts.map

package/out/interface/controller/state/view/i-app-data-upload-view.state.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"i-app-data-upload-view.state.d.ts","sourceRoot":"","sources":["../../../../../src/interface/controller/state/view/i-app-data-upload-view.state.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,gBAAgB,EAAE,cAAc,EAAE,MAAM,kBAAkB,CAAC;AACpE,OAAO,EAAE,UAAU,EAAE,MAAM,gBAAgB,CAAC;AAE5C;;;;;;GAMG;AACH,MAAM,WAAW,uBAAwB,SAAQ,UAAU;IACzD;;;;;OAKG;IACH,aAAa,EAAE,cAAc,CAAC;IAE9B;;;;;OAKG;IACH,YAAY,EAAE,gBAAgB,CAAC;CAChC"}

package/out/interface/controller/state/view/i-app-data-upload-view.state.js

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

package/out/interface/controller/state/view/index.d.ts

@@ -48,4 +48,5 @@ export * from './i-gantt-view.state';
 export * from './i-de-index-view.state';
 export * from './i-sub-app-ref-view.state';
 export * from './i-tab-search-view.state';
+export * from './i-app-data-upload-view.state';
 //# sourceMappingURL=index.d.ts.map

package/out/interface/controller/state/view/index.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../../../src/interface/controller/state/view/index.ts"],"names":[],"mappings":"AAAA,cAAc,gBAAgB,CAAC;AAC/B,cAAc,sBAAsB,CAAC;AACrC,cAAc,mBAAmB,CAAC;AAClC,cAAc,qBAAqB,CAAC;AACpC,cAAc,qBAAqB,CAAC;AACpC,cAAc,qBAAqB,CAAC;AACpC,cAAc,qBAAqB,CAAC;AACpC,cAAc,oBAAoB,CAAC;AACnC,cAAc,wBAAwB,CAAC;AACvC,cAAc,uBAAuB,CAAC;AACtC,cAAc,4BAA4B,CAAC;AAC3C,cAAc,4BAA4B,CAAC;AAC3C,cAAc,wBAAwB,CAAC;AACvC,cAAc,oBAAoB,CAAC;AACnC,cAAc,yBAAyB,CAAC;AACxC,cAAc,yBAAyB,CAAC;AACxC,cAAc,8BAA8B,CAAC;AAC7C,cAAc,yBAAyB,CAAC;AACxC,cAAc,sBAAsB,CAAC;AACrC,cAAc,uBAAuB,CAAC;AACtC,cAAc,qBAAqB,CAAC;AACpC,cAAc,sBAAsB,CAAC;AACrC,cAAc,sBAAsB,CAAC;AACrC,cAAc,sBAAsB,CAAC;AACrC,cAAc,8BAA8B,CAAC;AAC7C,cAAc,+BAA+B,CAAC;AAC9C,cAAc,6BAA6B,CAAC;AAC5C,cAAc,8BAA8B,CAAC;AAC7C,cAAc,wBAAwB,CAAC;AACvC,cAAc,4BAA4B,CAAC;AAC3C,cAAc,8BAA8B,CAAC;AAC7C,cAAc,uBAAuB,CAAC;AACtC,cAAc,2BAA2B,CAAC;AAC1C,cAAc,0BAA0B,CAAC;AACzC,cAAc,sBAAsB,CAAC;AACrC,cAAc,yBAAyB,CAAC;AACxC,cAAc,6BAA6B,CAAC;AAC5C,cAAc,0BAA0B,CAAC;AACzC,cAAc,uBAAuB,CAAC;AACtC,cAAc,iCAAiC,CAAC;AAChD,cAAc,0BAA0B,CAAC;AACzC,cAAc,6BAA6B,CAAC;AAC5C,cAAc,uBAAuB,CAAC;AACtC,cAAc,0BAA0B,CAAC;AACzC,cAAc,oBAAoB,CAAC;AACnC,cAAc,uBAAuB,CAAC;AACtC,cAAc,sBAAsB,CAAC;AACrC,cAAc,yBAAyB,CAAC;AACxC,cAAc,4BAA4B,CAAC;AAC3C,cAAc,2BAA2B,CAAC"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../../../src/interface/controller/state/view/index.ts"],"names":[],"mappings":"AAAA,cAAc,gBAAgB,CAAC;AAC/B,cAAc,sBAAsB,CAAC;AACrC,cAAc,mBAAmB,CAAC;AAClC,cAAc,qBAAqB,CAAC;AACpC,cAAc,qBAAqB,CAAC;AACpC,cAAc,qBAAqB,CAAC;AACpC,cAAc,qBAAqB,CAAC;AACpC,cAAc,oBAAoB,CAAC;AACnC,cAAc,wBAAwB,CAAC;AACvC,cAAc,uBAAuB,CAAC;AACtC,cAAc,4BAA4B,CAAC;AAC3C,cAAc,4BAA4B,CAAC;AAC3C,cAAc,wBAAwB,CAAC;AACvC,cAAc,oBAAoB,CAAC;AACnC,cAAc,yBAAyB,CAAC;AACxC,cAAc,yBAAyB,CAAC;AACxC,cAAc,8BAA8B,CAAC;AAC7C,cAAc,yBAAyB,CAAC;AACxC,cAAc,sBAAsB,CAAC;AACrC,cAAc,uBAAuB,CAAC;AACtC,cAAc,qBAAqB,CAAC;AACpC,cAAc,sBAAsB,CAAC;AACrC,cAAc,sBAAsB,CAAC;AACrC,cAAc,sBAAsB,CAAC;AACrC,cAAc,8BAA8B,CAAC;AAC7C,cAAc,+BAA+B,CAAC;AAC9C,cAAc,6BAA6B,CAAC;AAC5C,cAAc,8BAA8B,CAAC;AAC7C,cAAc,wBAAwB,CAAC;AACvC,cAAc,4BAA4B,CAAC;AAC3C,cAAc,8BAA8B,CAAC;AAC7C,cAAc,uBAAuB,CAAC;AACtC,cAAc,2BAA2B,CAAC;AAC1C,cAAc,0BAA0B,CAAC;AACzC,cAAc,sBAAsB,CAAC;AACrC,cAAc,yBAAyB,CAAC;AACxC,cAAc,6BAA6B,CAAC;AAC5C,cAAc,0BAA0B,CAAC;AACzC,cAAc,uBAAuB,CAAC;AACtC,cAAc,iCAAiC,CAAC;AAChD,cAAc,0BAA0B,CAAC;AACzC,cAAc,6BAA6B,CAAC;AAC5C,cAAc,uBAAuB,CAAC;AACtC,cAAc,0BAA0B,CAAC;AACzC,cAAc,oBAAoB,CAAC;AACnC,cAAc,uBAAuB,CAAC;AACtC,cAAc,sBAAsB,CAAC;AACrC,cAAc,yBAAyB,CAAC;AACxC,cAAc,4BAA4B,CAAC;AAC3C,cAAc,2BAA2B,CAAC;AAC1C,cAAc,gCAAgC,CAAC"}

package/out/interface/controller/state/view/index.js

@@ -48,3 +48,4 @@ export * from './i-gantt-view.state';
 export * from './i-de-index-view.state';
 export * from './i-sub-app-ref-view.state';
 export * from './i-tab-search-view.state';
+export * from './i-app-data-upload-view.state';

package/out/interface/register/i-register-params.d.ts

@@ -0,0 +1,31 @@
+import { IAppView, IControl, IControlItem } from '@ibiz/model-core';
+/**
+ * 自定义适配器注册参数接口
+ */
+export interface IRegisterParams {
+    /**
+     * 部件项模型
+     *
+     * @author ljx
+     * @date 2024-04-15 16:10:54
+     * @type {IModel}
+     */
+    controlItemModel?: IControlItem;
+    /**
+     * 部件模型
+     *
+     * @author ljx
+     * @date 2024-04-15 16:10:54
+     * @type {IPanel}
+     */
+    controlModel?: IControl;
+    /**
+     * 视图模型
+     *
+     * @author ljx
+     * @date 2024-04-15 16:10:54
+     * @type {IControl}
+     */
+    viewModel?: IAppView;
+}
+//# sourceMappingURL=i-register-params.d.ts.map

package/out/interface/register/i-register-params.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"i-register-params.d.ts","sourceRoot":"","sources":["../../../src/interface/register/i-register-params.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,QAAQ,EAAE,QAAQ,EAAE,YAAY,EAAE,MAAM,kBAAkB,CAAC;AAEpE;;GAEG;AACH,MAAM,WAAW,eAAe;IAC9B;;;;;;OAMG;IACH,gBAAgB,CAAC,EAAE,YAAY,CAAC;IAEhC;;;;;;OAMG;IACH,YAAY,CAAC,EAAE,QAAQ,CAAC;IAExB;;;;;;OAMG;IACH,SAAS,CAAC,EAAE,QAAQ,CAAC;CACtB"}

package/out/interface/register/i-register-params.js

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

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

@@ -1,2 +1,3 @@
 export * from './i-register';
+export * from './i-register-params';
 //# sourceMappingURL=index.d.ts.map

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

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../src/interface/register/index.ts"],"names":[],"mappings":"AAAA,cAAc,cAAc,CAAC"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../src/interface/register/index.ts"],"names":[],"mappings":"AAAA,cAAc,cAAc,CAAC;AAC7B,cAAc,qBAAqB,CAAC"}

package/out/interface/register/index.js

@@ -1 +1,2 @@
 export * from './i-register';
+export * from './i-register-params';

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

@@ -1,4 +1,4 @@
-import { IAppDataEntity, IAppDEACMode, IAppDEField, IDELogic } from '@ibiz/model-core';
+import { IAppDataEntity, IAppDEACMode, IAppDEDataImport, IAppDEField, IDELogic } from '@ibiz/model-core';
 /**
  * 从实体id计算实体codeName(小写)
  * @author lxm
@@ -56,4 +56,13 @@ export declare function filterFieldLogics(entity: IAppDataEntity, type: 'compute
  * @return {*}
  */
 export declare function findFieldById(entity: IAppDataEntity, fieldId: string): IAppDEField | undefined;
+/**
+ * 获取默认导入模型
+ * @author lxm
+ * @date 2024-04-18 02:44:09
+ * @export
+ * @param {IAppDataEntity} entity
+ * @return {*}  {(IAppDEDataImport | undefined)}
+ */
+export declare function getDefaultDataImport(entity: IAppDataEntity): IAppDEDataImport | undefined;
 //# sourceMappingURL=data-entity.d.ts.map

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

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

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

@@ -90,3 +90,17 @@ export function findFieldById(entity, fieldId) {
     var _a;
     return (_a = entity.appDEFields) === null || _a === void 0 ? void 0 : _a.find(item => item.id === fieldId);
 }
+/**
+ * 获取默认导入模型
+ * @author lxm
+ * @date 2024-04-18 02:44:09
+ * @export
+ * @param {IAppDataEntity} entity
+ * @return {*}  {(IAppDEDataImport | undefined)}
+ */
+export function getDefaultDataImport(entity) {
+    var _a;
+    if (entity.defaultAppDEDataImportId) {
+        return (_a = entity.appDEDataImports) === null || _a === void 0 ? void 0 : _a.find(item => item.id === entity.defaultAppDEDataImportId);
+    }
+}

package/out/register/custom-register.d.ts

@@ -0,0 +1,34 @@
+import { IRegisterParams } from '../interface';
+/**
+ * 自定义注册
+ */
+export declare class CustomRegister {
+    /**
+     * 获取适配器注册key
+     *
+     * @author ljx
+     * @date 2024-04-16 23:08:08
+     * @param {string} registerType
+     * @param {IRegisterParams} opts
+     * @return {string}
+     */
+    static getRegisterKey(registerType: string, opts: IRegisterParams): string;
+    /**
+     * 通过视图计算key
+     * 目前适用于计算面板项的key
+     * @author ljx
+     * @date 2024-04-16 23:08:08
+     * @param {IRegisterParams} opts
+     * @return {string}
+     */
+    static calcKeyByView(opts: IRegisterParams): string;
+    /**
+     * 通过部件计算key
+     * 没有实体的部件默认为APP
+     * @date 2024-04-16 23:08:08
+     * @param {IRegisterParams} opts
+     * @return {string}
+     */
+    static calcKeyByCtrl(opts: IRegisterParams): string;
+}
+//# sourceMappingURL=custom-register.d.ts.map

package/out/register/custom-register.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"custom-register.d.ts","sourceRoot":"","sources":["../../src/register/custom-register.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,eAAe,EAAE,MAAM,cAAc,CAAC;AAQ/C;;GAEG;AACH,qBAAa,cAAc;IACzB;;;;;;;;OAQG;IACH,MAAM,CAAC,cAAc,CAAC,YAAY,EAAE,MAAM,EAAE,IAAI,EAAE,eAAe,GAAG,MAAM;IAa1E;;;;;;;OAOG;IACH,MAAM,CAAC,aAAa,CAAC,IAAI,EAAE,eAAe,GAAG,MAAM;IAkBnD;;;;;;OAMG;IACH,MAAM,CAAC,aAAa,CAAC,IAAI,EAAE,eAAe,GAAG,MAAM;CAuBpD"}

package/out/register/custom-register.js

@@ -0,0 +1,80 @@
+import { calcDeCodeNameById } from '../model';
+import { CONTROL_PROVIDER_PREFIX, FORMDETAIL_PROVIDER_PREFIX, GRIDCOLUMN_PROVIDER_PREFIX, PANELITEM_PROVIDER_PREFIX, } from './helper';
+/**
+ * 自定义注册
+ */
+export class CustomRegister {
+    /**
+     * 获取适配器注册key
+     *
+     * @author ljx
+     * @date 2024-04-16 23:08:08
+     * @param {string} registerType
+     * @param {IRegisterParams} opts
+     * @return {string}
+     */
+    static getRegisterKey(registerType, opts) {
+        switch (registerType) {
+            case PANELITEM_PROVIDER_PREFIX:
+                return this.calcKeyByView(opts);
+            case FORMDETAIL_PROVIDER_PREFIX:
+            case GRIDCOLUMN_PROVIDER_PREFIX:
+            case CONTROL_PROVIDER_PREFIX:
+                return this.calcKeyByCtrl(opts);
+            default:
+                return '';
+        }
+    }
+    /**
+     * 通过视图计算key
+     * 目前适用于计算面板项的key
+     * @author ljx
+     * @date 2024-04-16 23:08:08
+     * @param {IRegisterParams} opts
+     * @return {string}
+     */
+    static calcKeyByView(opts) {
+        const { controlItemModel, controlModel, viewModel } = opts;
+        let key = '';
+        if (viewModel === null || viewModel === void 0 ? void 0 : viewModel.codeName) {
+            key += `${viewModel.codeName.toUpperCase()}`;
+        }
+        if (controlModel === null || controlModel === void 0 ? void 0 : controlModel.codeName) {
+            key += `@${controlModel.codeName.toUpperCase()}`;
+        }
+        // TODO 面板项模型中没有codeName暂用id
+        if (controlItemModel === null || controlItemModel === void 0 ? void 0 : controlItemModel.id) {
+            key += `@${controlItemModel.id.toUpperCase()}`;
+        }
+        return key;
+    }
+    /**
+     * 通过部件计算key
+     * 没有实体的部件默认为APP
+     * @date 2024-04-16 23:08:08
+     * @param {IRegisterParams} opts
+     * @return {string}
+     */
+    static calcKeyByCtrl(opts) {
+        const { controlModel, controlItemModel } = opts;
+        let key = '';
+        let prefix = 'APP';
+        if (controlModel) {
+            const { appDataEntityId, controlType, codeName } = controlModel;
+            if (appDataEntityId) {
+                prefix = calcDeCodeNameById(appDataEntityId).toUpperCase();
+            }
+            if (controlType) {
+                key += `@${controlType.toUpperCase()}`;
+            }
+            if (codeName) {
+                key += `@${codeName.toUpperCase()}`;
+            }
+        }
+        if (controlItemModel === null || controlItemModel === void 0 ? void 0 : controlItemModel.codeName) {
+            key += `@${controlItemModel.codeName.toUpperCase()}`;
+        }
+        key = prefix + key;
+        return key;
+    }
+}

package/out/register/helper/control-register.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"control-register.d.ts","sourceRoot":"","sources":["../../../src/register/helper/control-register.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,QAAQ,EAAE,MAAM,kBAAkB,CAAC;AAC5C,OAAO,EAAE,gBAAgB,EAAE,MAAM,iBAAiB,CAAC;AAGnD,cAAc;AACd,eAAO,MAAM,uBAAuB,YAAY,CAAC;AAEjD;;;;;;;GAOG;AACH,wBAAgB,uBAAuB,CACrC,GAAG,EAAE,MAAM,EACX,QAAQ,EAAE,MAAM,gBAAgB,GAC/B,IAAI,CAEN;AAQD;;;;;;;GAOG;AACH,wBAAsB,kBAAkB,CACtC,KAAK,EAAE,QAAQ,GACd,OAAO,CAAC,gBAAgB,GAAG,SAAS,CAAC,CA6CvC"}
+{"version":3,"file":"control-register.d.ts","sourceRoot":"","sources":["../../../src/register/helper/control-register.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,QAAQ,EAAE,MAAM,kBAAkB,CAAC;AAC5C,OAAO,EAAE,gBAAgB,EAAE,MAAM,iBAAiB,CAAC;AAInD,cAAc;AACd,eAAO,MAAM,uBAAuB,YAAY,CAAC;AAEjD;;;;;;;GAOG;AACH,wBAAgB,uBAAuB,CACrC,GAAG,EAAE,MAAM,EACX,QAAQ,EAAE,MAAM,gBAAgB,GAC/B,IAAI,CAEN;AAQD;;;;;;;GAOG;AACH,wBAAsB,kBAAkB,CACtC,KAAK,EAAE,QAAQ,GACd,OAAO,CAAC,gBAAgB,GAAG,SAAS,CAAC,CAyDvC"}

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

@@ -1,4 +1,5 @@
 import { getPluginRegisterKey } from './common-register';
+import { CustomRegister } from '../custom-register';
 /** 部件适配器前缀 */
 export const CONTROL_PROVIDER_PREFIX = 'CONTROL';
 /**
@@ -26,6 +27,17 @@ function getProvider(key) {
 export async function getControlProvider(model) {
     let provider;
     const { controlType, controlStyle, sysPFPluginId, appId } = model;
+    // 找自定义注册的适配器
+    const registerKey = CustomRegister.getRegisterKey(CONTROL_PROVIDER_PREFIX, {
+        controlModel: model,
+    });
+    provider = getProvider(registerKey);
+    if (!provider) {
+        ibiz.log.debug(`找不到自定义注册标识为[${registerKey}]对应的适配器`);
+    }
+    else {
+        return provider;
+    }
     // 找插件适配器
     if (sysPFPluginId) {
         const pluginKey = await getPluginRegisterKey(sysPFPluginId, appId);

package/out/register/helper/form-detail-register.d.ts

@@ -1,4 +1,4 @@
-import { IDEFormDetail } from '@ibiz/model-core';
+import { IDEForm, IDEFormDetail } from '@ibiz/model-core';
 import { IFormDetailProvider } from '../../interface';
 /** 表单成员适配器前缀 */
 export declare const FORMDETAIL_PROVIDER_PREFIX = "FORMDETAIL";
@@ -19,5 +19,5 @@ export declare function registerFormDetailProvider(key: string, callback: () =>
  * @param {IAppView} model
  * @return {*}  {Promise<IFormDetailProvider>}
  */
-export declare function getFormDetailProvider(model: IDEFormDetail): Promise<IFormDetailProvider | undefined>;
+export declare function getFormDetailProvider(model: IDEFormDetail, formModel: IDEForm): Promise<IFormDetailProvider | undefined>;
 //# sourceMappingURL=form-detail-register.d.ts.map

package/out/register/helper/form-detail-register.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"form-detail-register.d.ts","sourceRoot":"","sources":["../../../src/register/helper/form-detail-register.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,aAAa,EAAE,MAAM,kBAAkB,CAAC;AACjD,OAAO,EAAE,mBAAmB,EAAE,MAAM,iBAAiB,CAAC;AAGtD,gBAAgB;AAChB,eAAO,MAAM,0BAA0B,eAAe,CAAC;AAEvD;;;;;;;GAOG;AACH,wBAAgB,0BAA0B,CACxC,GAAG,EAAE,MAAM,EACX,QAAQ,EAAE,MAAM,mBAAmB,GAClC,IAAI,CAEN;AAQD;;;;;;;GAOG;AACH,wBAAsB,qBAAqB,CACzC,KAAK,EAAE,aAAa,GACnB,OAAO,CAAC,mBAAmB,GAAG,SAAS,CAAC,CAwB1C"}
+{"version":3,"file":"form-detail-register.d.ts","sourceRoot":"","sources":["../../../src/register/helper/form-detail-register.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,OAAO,EAAE,aAAa,EAAE,MAAM,kBAAkB,CAAC;AAC1D,OAAO,EAAE,mBAAmB,EAAE,MAAM,iBAAiB,CAAC;AAItD,gBAAgB;AAChB,eAAO,MAAM,0BAA0B,eAAe,CAAC;AAEvD;;;;;;;GAOG;AACH,wBAAgB,0BAA0B,CACxC,GAAG,EAAE,MAAM,EACX,QAAQ,EAAE,MAAM,mBAAmB,GAClC,IAAI,CAEN;AAQD;;;;;;;GAOG;AACH,wBAAsB,qBAAqB,CACzC,KAAK,EAAE,aAAa,EACpB,SAAS,EAAE,OAAO,GACjB,OAAO,CAAC,mBAAmB,GAAG,SAAS,CAAC,CAuC1C"}

package/out/register/helper/form-detail-register.js

@@ -1,4 +1,5 @@
 import { getPluginRegisterKey } from './common-register';
+import { CustomRegister } from '../custom-register';
 /** 表单成员适配器前缀 */
 export const FORMDETAIL_PROVIDER_PREFIX = 'FORMDETAIL';
 /**
@@ -23,9 +24,21 @@ function getProvider(key) {
  * @param {IAppView} model
  * @return {*}  {Promise<IFormDetailProvider>}
  */
-export async function getFormDetailProvider(model) {
+export async function getFormDetailProvider(model, formModel) {
     let provider;
     const { detailType, sysPFPluginId, appId } = model;
+    // 找自定义注册的适配器
+    const registerKey = CustomRegister.getRegisterKey(FORMDETAIL_PROVIDER_PREFIX, {
+        controlItemModel: model,
+        controlModel: formModel,
+    });
+    provider = getProvider(registerKey);
+    if (!provider) {
+        ibiz.log.debug(`找不到自定义注册标识为[${registerKey}]对应的适配器`);
+    }
+    else {
+        return provider;
+    }
     // 找插件适配器
     if (sysPFPluginId) {
         const pluginKey = await getPluginRegisterKey(sysPFPluginId, appId);

package/out/register/helper/grid-column-register.d.ts

@@ -1,4 +1,4 @@
-import { IDEGridColumn } from '@ibiz/model-core';
+import { IDEGrid, IDEGridColumn } from '@ibiz/model-core';
 import { IGridColumnProvider } from '../../interface';
 /** 表格列适配器前缀 */
 export declare const GRIDCOLUMN_PROVIDER_PREFIX = "GRIDCOLUMN";
@@ -19,5 +19,5 @@ export declare function registerGridColumnProvider(key: string, callback: () =>
  * @param {IAppView} model
  * @return {*}  {Promise<IGridColumnProvider>}
  */
-export declare function getGridColumnProvider(model: IDEGridColumn): Promise<IGridColumnProvider | undefined>;
+export declare function getGridColumnProvider(model: IDEGridColumn, gridModel: IDEGrid): Promise<IGridColumnProvider | undefined>;
 //# sourceMappingURL=grid-column-register.d.ts.map

package/out/register/helper/grid-column-register.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"grid-column-register.d.ts","sourceRoot":"","sources":["../../../src/register/helper/grid-column-register.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,aAAa,EAAE,MAAM,kBAAkB,CAAC;AACjD,OAAO,EAAE,mBAAmB,EAAE,MAAM,iBAAiB,CAAC;AAGtD,eAAe;AACf,eAAO,MAAM,0BAA0B,eAAe,CAAC;AAEvD;;;;;;;GAOG;AACH,wBAAgB,0BAA0B,CACxC,GAAG,EAAE,MAAM,EACX,QAAQ,EAAE,MAAM,mBAAmB,GAClC,IAAI,CAEN;AAQD;;;;;;;GAOG;AACH,wBAAsB,qBAAqB,CACzC,KAAK,EAAE,aAAa,GACnB,OAAO,CAAC,mBAAmB,GAAG,SAAS,CAAC,CA0B1C"}
+{"version":3,"file":"grid-column-register.d.ts","sourceRoot":"","sources":["../../../src/register/helper/grid-column-register.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,OAAO,EAAE,aAAa,EAAE,MAAM,kBAAkB,CAAC;AAC1D,OAAO,EAAE,mBAAmB,EAAE,MAAM,iBAAiB,CAAC;AAItD,eAAe;AACf,eAAO,MAAM,0BAA0B,eAAe,CAAC;AAEvD;;;;;;;GAOG;AACH,wBAAgB,0BAA0B,CACxC,GAAG,EAAE,MAAM,EACX,QAAQ,EAAE,MAAM,mBAAmB,GAClC,IAAI,CAEN;AAQD;;;;;;;GAOG;AACH,wBAAsB,qBAAqB,CACzC,KAAK,EAAE,aAAa,EACpB,SAAS,EAAE,OAAO,GACjB,OAAO,CAAC,mBAAmB,GAAG,SAAS,CAAC,CAyC1C"}

package/out/register/helper/grid-column-register.js

@@ -1,4 +1,5 @@
 import { getPluginRegisterKey } from './common-register';
+import { CustomRegister } from '../custom-register';
 /** 表格列适配器前缀 */
 export const GRIDCOLUMN_PROVIDER_PREFIX = 'GRIDCOLUMN';
 /**
@@ -23,9 +24,21 @@ function getProvider(key) {
  * @param {IAppView} model
  * @return {*}  {Promise<IGridColumnProvider>}
  */
-export async function getGridColumnProvider(model) {
+export async function getGridColumnProvider(model, gridModel) {
     let provider;
     const { columnType, enableRowEdit, sysPFPluginId, appId } = model;
+    // 找自定义注册的适配器
+    const registerKey = CustomRegister.getRegisterKey(GRIDCOLUMN_PROVIDER_PREFIX, {
+        controlItemModel: model,
+        controlModel: gridModel,
+    });
+    provider = getProvider(registerKey);
+    if (!provider) {
+        ibiz.log.debug(`找不到自定义注册标识为[${registerKey}]对应的适配器`);
+    }
+    else {
+        return provider;
+    }
     // 找插件适配器
     if (sysPFPluginId) {
         const pluginKey = await getPluginRegisterKey(sysPFPluginId, appId);

package/out/register/helper/panel-item-register.d.ts

@@ -1,4 +1,4 @@
-import { IPanelItem } from '@ibiz/model-core';
+import { IAppView, IPanel, IPanelItem } from '@ibiz/model-core';
 import { IPanelItemProvider } from '../../interface';
 /** 面板成员适配器前缀 */
 export declare const PANELITEM_PROVIDER_PREFIX = "PANELITEM";
@@ -19,5 +19,5 @@ export declare function registerPanelItemProvider(key: string, callback: () => I
  * @param {IAppView} model
  * @return {*}  {Promise<IPanelItemProvider>}
  */
-export declare function getPanelItemProvider(model: IPanelItem): Promise<IPanelItemProvider | undefined>;
+export declare function getPanelItemProvider(model: IPanelItem, panelModel: IPanel, viewModel: IAppView): Promise<IPanelItemProvider | undefined>;
 //# sourceMappingURL=panel-item-register.d.ts.map

package/out/register/helper/panel-item-register.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"panel-item-register.d.ts","sourceRoot":"","sources":["../../../src/register/helper/panel-item-register.ts"],"names":[],"mappings":"AAAA,OAAO,EAGL,UAAU,EAEX,MAAM,kBAAkB,CAAC;AAC1B,OAAO,EAAE,kBAAkB,EAAE,MAAM,iBAAiB,CAAC;AAGrD,gBAAgB;AAChB,eAAO,MAAM,yBAAyB,cAAc,CAAC;AAErD;;;;;;;GAOG;AACH,wBAAgB,yBAAyB,CACvC,GAAG,EAAE,MAAM,EACX,QAAQ,EAAE,MAAM,kBAAkB,GACjC,IAAI,CAKN;AAQD;;;;;;;GAOG;AACH,wBAAsB,oBAAoB,CACxC,KAAK,EAAE,UAAU,GAChB,OAAO,CAAC,kBAAkB,GAAG,SAAS,CAAC,CAuEzC"}
+{"version":3,"file":"panel-item-register.d.ts","sourceRoot":"","sources":["../../../src/register/helper/panel-item-register.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,QAAQ,EACR,MAAM,EAGN,UAAU,EAEX,MAAM,kBAAkB,CAAC;AAC1B,OAAO,EAAE,kBAAkB,EAAE,MAAM,iBAAiB,CAAC;AAIrD,gBAAgB;AAChB,eAAO,MAAM,yBAAyB,cAAc,CAAC;AAErD;;;;;;;GAOG;AACH,wBAAgB,yBAAyB,CACvC,GAAG,EAAE,MAAM,EACX,QAAQ,EAAE,MAAM,kBAAkB,GACjC,IAAI,CAKN;AAQD;;;;;;;GAOG;AACH,wBAAsB,oBAAoB,CACxC,KAAK,EAAE,UAAU,EACjB,UAAU,EAAE,MAAM,EAClB,SAAS,EAAE,QAAQ,GAClB,OAAO,CAAC,kBAAkB,GAAG,SAAS,CAAC,CAoFzC"}

package/out/register/helper/panel-item-register.js

@@ -1,4 +1,5 @@
 import { getPluginRegisterKey } from './common-register';
+import { CustomRegister } from '../custom-register';
 /** 面板成员适配器前缀 */
 export const PANELITEM_PROVIDER_PREFIX = 'PANELITEM';
 /**
@@ -23,10 +24,23 @@ function getProvider(key) {
  * @param {IAppView} model
  * @return {*}  {Promise<IPanelItemProvider>}
  */
-export async function getPanelItemProvider(model) {
+export async function getPanelItemProvider(model, panelModel, viewModel) {
     var _a;
     let provider;
     const { itemType, sysPFPluginId, appId, controlRenders } = model;
+    // 找自定义注册的适配器
+    const registerKey = CustomRegister.getRegisterKey(PANELITEM_PROVIDER_PREFIX, {
+        controlItemModel: model,
+        controlModel: panelModel,
+        viewModel,
+    });
+    provider = getProvider(registerKey);
+    if (!provider) {
+        ibiz.log.debug(`找不到自定义注册标识为[${registerKey}]对应的适配器`);
+    }
+    else {
+        return provider;
+    }
     // 找插件适配器
     if (sysPFPluginId) {
         const pluginKey = await getPluginRegisterKey(sysPFPluginId, appId);

package/out/service/utils/dynamic-code-list/dynamic-code-list.d.ts

@@ -108,6 +108,14 @@ export declare class DynamicCodeListCache {
      * @type {Promise<void>}
      */
     protected initPromise?: Promise<void>;
+    /**
+     * 常见关键字
+     *
+     * @author zzq
+     * @date 2024-04-15 17:08:06
+     * @type {Promise<void>}
+     */
+    protected commonKeys: string[];
     constructor(codeList: IAppCodeList);
     /**
      * 设置上下文以及查询参数

package/out/service/utils/dynamic-code-list/dynamic-code-list.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"dynamic-code-list.d.ts","sourceRoot":"","sources":["../../../../src/service/utils/dynamic-code-list/dynamic-code-list.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,YAAY,EAAE,MAAM,kBAAkB,CAAC;AAChD,OAAO,EAEL,cAAc,EAGf,MAAM,qBAAqB,CAAC;AAE7B,OAAO,EAAE,OAAO,EAAe,MAAM,SAAS,CAAC;AAC/C,OAAO,EAAE,WAAW,EAAE,MAAM,sBAAsB,CAAC;AACnD,OAAO,EAAE,YAAY,EAAe,MAAM,oBAAoB,CAAC;AAK/D;;;;;;GAMG;AACH,KAAK,SAAS,GAAG;IACf;;;;;;OAMG;IACH,cAAc,EAAE,MAAM,CAAC;IAEvB;;;;;;OAMG;IACH,KAAK,CAAC,EAAE,YAAY,EAAE,CAAC;IAEvB;;;;;;OAMG;IACH,OAAO,CAAC,EAAE,OAAO,CAAC,YAAY,EAAE,CAAC,CAAC;CACnC,CAAC;AAEF;;;;;;;GAOG;AACH,qBAAa,oBAAoB;IAC/B,SAAS,CAAC,GAAG,EAAG,WAAW,CAAC;IAE5B;;;;;;;OAOG;IACH,SAAS,CAAC,QAAQ,EAAE,YAAY,CAAC;IAEjC;;;;;;OAMG;IACH,SAAS,CAAC,KAAK,yBAAgC;IAE/C;;;;;;;OAOG;IACH,SAAS,CAAC,YAAY,EAAE,OAAO,CAAS;IAExC;;;;;;;OAOG;IACH,SAAS,CAAC,OAAO,EAAE,QAAQ,CAAwB;IAEnD;;;;;;;OAOG;IACH,SAAS,CAAC,MAAM,EAAE,OAAO,CAAM;IAE/B;;;;;;OAMG;IACH,SAAS,CAAC,GAAG,EAAE,OAAO,CAAC;QAAE,MAAM,EAAE,CAAC,IAAI,EAAE,YAAY,EAAE,KAAK,IAAI,CAAA;KAAE,CAAC,CAClD;IAEhB;;;;;;OAMG;IACH,SAAS,CAAC,WAAW,CAAC,EAAE,OAAO,CAAC,IAAI,CAAC,CAAC;gBAE1B,QAAQ,EAAE,YAAY;IAUlC;;;;;;;;OAQG;IACH,SAAS,CAAC,SAAS,CAAC,OAAO,CAAC,EAAE,QAAQ,EAAE,MAAM,CAAC,EAAE,OAAO,GAAG,IAAI;IAS/D;;;;;;OAMG;IACG,IAAI,IAAI,OAAO,CAAC,IAAI,CAAC;IAqB3B;;;;;;;OAOG;IACH,SAAS,CAAC,WAAW,CAAC,IAAI,EAAE,KAAK,GAAG,YAAY;IAwEhD,SAAS,CAAC,iBAAiB,CAAC,IAAI,EAAE,KAAK,GAAG,YAAY;IAetD,SAAS,CAAC,aAAa,CAAC,GAAG,EAAE,KAAK,EAAE,GAAG,KAAK,EAAE;IAS9C;;;;;;;;;OASG;cACa,IAAI,CAClB,OAAO,EAAE,QAAQ,EACjB,MAAM,GAAE,OAAY,GACnB,OAAO,CAAC,YAAY,EAAE,CAAC;IAwF1B;;;;OAIG;IACH,SAAS,CAAC,eAAe,CAAC,KAAK,EAAE,KAAK,EAAE,GAAG,YAAY,EAAE,GAAG,SAAS;IAmBrE;;;;;;;;OAQG;IACG,GAAG,CAAC,OAAO,EAAE,QAAQ,EAAE,MAAM,GAAE,OAAY,GAAG,OAAO,CAAC,YAAY,EAAE,CAAC;IA0C3E;;;;;;;OAOG;IACH,SAAS,CAAC,cAAc,CAAC,GAAG,EAAE,cAAc,GAAG,IAAI;IAenD;;;;;;OAMG;IACG,OAAO,IAAI,OAAO,CAAC,IAAI,CAAC;IAS9B;;;;;;;OAOG;IACH,QAAQ,CACN,EAAE,EAAE,CAAC,IAAI,EAAE,YAAY,EAAE,KAAK,IAAI,EAClC,SAAS,GAAE,OAAc,GACxB,IAAI;IASP;;;;;;OAMG;IACH,SAAS,CAAC,EAAE,EAAE,CAAC,IAAI,EAAE,YAAY,EAAE,KAAK,IAAI,GAAG,IAAI;IAInD;;;;;OAKG;IACH,OAAO,IAAI,IAAI;CAMhB"}
+{"version":3,"file":"dynamic-code-list.d.ts","sourceRoot":"","sources":["../../../../src/service/utils/dynamic-code-list/dynamic-code-list.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,YAAY,EAAE,MAAM,kBAAkB,CAAC;AAChD,OAAO,EAEL,cAAc,EAGf,MAAM,qBAAqB,CAAC;AAE7B,OAAO,EAAE,OAAO,EAAe,MAAM,SAAS,CAAC;AAC/C,OAAO,EAAE,WAAW,EAAE,MAAM,sBAAsB,CAAC;AACnD,OAAO,EAAE,YAAY,EAAe,MAAM,oBAAoB,CAAC;AAK/D;;;;;;GAMG;AACH,KAAK,SAAS,GAAG;IACf;;;;;;OAMG;IACH,cAAc,EAAE,MAAM,CAAC;IAEvB;;;;;;OAMG;IACH,KAAK,CAAC,EAAE,YAAY,EAAE,CAAC;IAEvB;;;;;;OAMG;IACH,OAAO,CAAC,EAAE,OAAO,CAAC,YAAY,EAAE,CAAC,CAAC;CACnC,CAAC;AAEF;;;;;;;GAOG;AACH,qBAAa,oBAAoB;IAC/B,SAAS,CAAC,GAAG,EAAG,WAAW,CAAC;IAE5B;;;;;;;OAOG;IACH,SAAS,CAAC,QAAQ,EAAE,YAAY,CAAC;IAEjC;;;;;;OAMG;IACH,SAAS,CAAC,KAAK,yBAAgC;IAE/C;;;;;;;OAOG;IACH,SAAS,CAAC,YAAY,EAAE,OAAO,CAAS;IAExC;;;;;;;OAOG;IACH,SAAS,CAAC,OAAO,EAAE,QAAQ,CAAwB;IAEnD;;;;;;;OAOG;IACH,SAAS,CAAC,MAAM,EAAE,OAAO,CAAM;IAE/B;;;;;;OAMG;IACH,SAAS,CAAC,GAAG,EAAE,OAAO,CAAC;QAAE,MAAM,EAAE,CAAC,IAAI,EAAE,YAAY,EAAE,KAAK,IAAI,CAAA;KAAE,CAAC,CAClD;IAEhB;;;;;;OAMG;IACH,SAAS,CAAC,WAAW,CAAC,EAAE,OAAO,CAAC,IAAI,CAAC,CAAC;IAEtC;;;;;;OAMG;IACH,SAAS,CAAC,UAAU,EAAE,MAAM,EAAE,CAA2B;gBAE7C,QAAQ,EAAE,YAAY;IAUlC;;;;;;;;OAQG;IACH,SAAS,CAAC,SAAS,CAAC,OAAO,CAAC,EAAE,QAAQ,EAAE,MAAM,CAAC,EAAE,OAAO,GAAG,IAAI;IAS/D;;;;;;OAMG;IACG,IAAI,IAAI,OAAO,CAAC,IAAI,CAAC;IAqB3B;;;;;;;OAOG;IACH,SAAS,CAAC,WAAW,CAAC,IAAI,EAAE,KAAK,GAAG,YAAY;IAwEhD,SAAS,CAAC,iBAAiB,CAAC,IAAI,EAAE,KAAK,GAAG,YAAY;IAetD,SAAS,CAAC,aAAa,CAAC,GAAG,EAAE,KAAK,EAAE,GAAG,KAAK,EAAE;IAS9C;;;;;;;;;OASG;cACa,IAAI,CAClB,OAAO,EAAE,QAAQ,EACjB,MAAM,GAAE,OAAY,GACnB,OAAO,CAAC,YAAY,EAAE,CAAC;IA0F1B;;;;OAIG;IACH,SAAS,CAAC,eAAe,CAAC,KAAK,EAAE,KAAK,EAAE,GAAG,YAAY,EAAE,GAAG,SAAS;IAmBrE;;;;;;;;OAQG;IACG,GAAG,CAAC,OAAO,EAAE,QAAQ,EAAE,MAAM,GAAE,OAAY,GAAG,OAAO,CAAC,YAAY,EAAE,CAAC;IA0C3E;;;;;;;OAOG;IACH,SAAS,CAAC,cAAc,CAAC,GAAG,EAAE,cAAc,GAAG,IAAI;IAenD;;;;;;OAMG;IACG,OAAO,IAAI,OAAO,CAAC,IAAI,CAAC;IAS9B;;;;;;;OAOG;IACH,QAAQ,CACN,EAAE,EAAE,CAAC,IAAI,EAAE,YAAY,EAAE,KAAK,IAAI,EAClC,SAAS,GAAE,OAAc,GACxB,IAAI;IASP;;;;;;OAMG;IACH,SAAS,CAAC,EAAE,EAAE,CAAC,IAAI,EAAE,YAAY,EAAE,KAAK,IAAI,GAAG,IAAI;IAInD;;;;;OAKG;IACH,OAAO,IAAI,IAAI;CAMhB"}

package/out/service/utils/dynamic-code-list/dynamic-code-list.js

@@ -57,6 +57,14 @@ export class DynamicCodeListCache {
          * @protected
          */
         this.evt = new QXEvent();
+        /**
+         * 常见关键字
+         *
+         * @author zzq
+         * @date 2024-04-15 17:08:06
+         * @type {Promise<void>}
+         */
+        this.commonKeys = ['query', 'queryconds'];
         this.codeList = codeList;
         // 动态代码表监听数据变化
         this.codelistChange = this.codelistChange.bind(this);
@@ -169,15 +177,15 @@ export class DynamicCodeListCache {
     }
     presetconvertData(data) {
         const result = {};
-        const { color, bkcolor, disabled, id, text, label, value, cls } = data;
+        const { color, bkcolor, disabled, id, text, value, cls } = data;
         result.value = value;
         result.color = color;
         result.bkcolor = bkcolor;
         result.text = text;
         result.id = id;
-        result.id = label;
         result.disableSelect = disabled;
         result.cls = cls;
+        result.data = data;
         return result;
     }
     sortShoworder(arr) {
@@ -199,11 +207,14 @@ export class DynamicCodeListCache {
      * @returns {*}  {Promise<CodeListItem[]>}
      */
     async load(context, params = {}) {
-        this.setParams(context, params);
+        // 删除常见查询关键字属性，防止查询失败
+        const tempParams = Object.assign({}, params);
+        this.commonKeys.forEach((key) => {
+            delete tempParams[key];
+        });
+        this.setParams(context, tempParams);
         const app = ibiz.hub.getApp(context.srfappid);
         const { appDataEntityId, appDEDataSetId, minorSortAppDEFieldId, minorSortDir, pvalueAppDEFieldId, customCond, } = this.codeList;
-        // *处理查询参数
-        const tempParams = Object.assign({}, params);
         // 排序
         if (minorSortAppDEFieldId && minorSortDir) {
             Object.assign(tempParams, {

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":"AACA,OAAO,EAAE,kBAAkB,EAAE,mBAAmB,EAAE,MAAM,kBAAkB,CAAC;AAG3E,OAAO,EAAE,KAAK,EAAE,aAAa,EAAE,MAAM,oBAAoB,CAAC;AAG1D,OAAO,EAAE,YAAY,EAAE,MAAM,kBAAkB,CAAC;AAahD;;;;;;;GAOG;AACH,qBAAa,mBAAoB,SAAQ,YAAa,YAAW,aAAa;IACpE,KAAK,EAAE,MAAM,CAAC;IAEd,GAAG,EAAE,MAAM,CAAC;IAEZ,MAAM,EAAE,MAAM,CAAC;IAEf,OAAO,EAAE,KAAK,CAAC;IAEf,UAAU,EAAE,KAAK,CAAC;IAE1B;;;;OAIG;IACK,KAAK,EAAE,MAAM,mBAAmB,CAAC;gBAGvC,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;IA+MH,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":"AACA,OAAO,EAAE,kBAAkB,EAAE,mBAAmB,EAAE,MAAM,kBAAkB,CAAC;AAG3E,OAAO,EAAE,KAAK,EAAE,aAAa,EAAE,MAAM,oBAAoB,CAAC;AAG1D,OAAO,EAAE,YAAY,EAAE,MAAM,kBAAkB,CAAC;AAahD;;;;;;;GAOG;AACH,qBAAa,mBAAoB,SAAQ,YAAa,YAAW,aAAa;IACpE,KAAK,EAAE,MAAM,CAAC;IAEd,GAAG,EAAE,MAAM,CAAC;IAEZ,MAAM,EAAE,MAAM,CAAC;IAEf,OAAO,EAAE,KAAK,CAAC;IAEf,UAAU,EAAE,KAAK,CAAC;IAE1B;;;;OAIG;IACK,KAAK,EAAE,MAAM,mBAAmB,CAAC;gBAGvC,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;IA+MH,SAAS,CAAC,QAAQ,CAAC,KAAK,EAAE,kBAAkB,GAAG,KAAK,GAAG,SAAS;IAsBhE;;;;;;;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

@@ -222,7 +222,13 @@ export class TreeDataSetNodeData extends TreeNodeData {
         const icon = super.calcIcon(model) || {};
         const { iconAppDEFieldId, detreeNodeDataItems } = model;
         if (iconAppDEFieldId && this._deData[iconAppDEFieldId]) {
-            icon.imagePath = this._deData[iconAppDEFieldId];
+            const value = this._deData[iconAppDEFieldId];
+            if (value.indexOf('fa-') !== -1) {
+                icon.cssClass = value;
+            }
+            else {
+                icon.imagePath = value;
+            }
         }
         if (icon) {
             this._icon = icon;

package/out/ui-action/provider/front-ui-action-provider.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"front-ui-action-provider.d.ts","sourceRoot":"","sources":["../../../src/ui-action/provider/front-ui-action-provider.ts"],"names":[],"mappings":"AAMA,OAAO,EAAE,cAAc,EAAa,MAAM,kBAAkB,CAAC;AAG7D,OAAO,EAAE,cAAc,EAAE,eAAe,EAAc,MAAM,iBAAiB,CAAC;AAE9E,OAAO,EAAE,oBAAoB,EAAE,MAAM,2BAA2B,CAAC;AAEjE;;;;;;;;GAQG;AACH,qBAAa,qBAAsB,SAAQ,oBAAoB;IACvD,UAAU,CACd,MAAM,EAAE,cAAc,EACtB,IAAI,EAAE,cAAc,GACnB,OAAO,CAAC,eAAe,CAAC;IAoE3B;;;;;;;;OAQG;IACH,SAAS,CAAC,OAAO,CACf,MAAM,EAAE,cAAc,EACtB,IAAI,EAAE,cAAc,GACnB,eAAe;IAalB;;;;;;OAMG;cACa,YAAY,CAC1B,MAAM,EAAE,cAAc,EACtB,IAAI,EAAE,cAAc,GACnB,OAAO,CAAC,IAAI,CAAC;IAiEhB;;;;;;OAMG;cACa,iBAAiB,CAC/B,MAAM,EAAE,cAAc,EACtB,IAAI,EAAE,cAAc,GACnB,OAAO,CAAC,eAAe,CAAC;IA4C3B;;;;;;OAMG;cACa,iBAAiB,CAC/B,MAAM,EAAE,cAAc,EACtB,IAAI,EAAE,cAAc,GACnB,OAAO,CAAC,IAAI,CAAC;IAoDhB;;;;;;;;OAQG;cACa,YAAY,CAC1B,MAAM,EAAE,cAAc,EACtB,IAAI,EAAE,cAAc,GACnB,OAAO,CAAC,eAAe,CAAC;CAmD5B"}
+{"version":3,"file":"front-ui-action-provider.d.ts","sourceRoot":"","sources":["../../../src/ui-action/provider/front-ui-action-provider.ts"],"names":[],"mappings":"AAOA,OAAO,EAAE,cAAc,EAAa,MAAM,kBAAkB,CAAC;AAG7D,OAAO,EACL,cAAc,EACd,eAAe,EAIhB,MAAM,iBAAiB,CAAC;AAEzB,OAAO,EAAE,oBAAoB,EAAE,MAAM,2BAA2B,CAAC;AAGjE;;;;;;;;GAQG;AACH,qBAAa,qBAAsB,SAAQ,oBAAoB;IACvD,UAAU,CACd,MAAM,EAAE,cAAc,EACtB,IAAI,EAAE,cAAc,GACnB,OAAO,CAAC,eAAe,CAAC;IAoE3B;;;;;;;;OAQG;IACH,SAAS,CAAC,OAAO,CACf,MAAM,EAAE,cAAc,EACtB,IAAI,EAAE,cAAc,GACnB,eAAe;IAalB;;;;;;OAMG;cACa,YAAY,CAC1B,MAAM,EAAE,cAAc,EACtB,IAAI,EAAE,cAAc,GACnB,OAAO,CAAC,IAAI,CAAC;IAiEhB;;;;;;OAMG;cACa,iBAAiB,CAC/B,MAAM,EAAE,cAAc,EACtB,IAAI,EAAE,cAAc,GACnB,OAAO,CAAC,eAAe,CAAC;IA4B3B;;;;;;OAMG;cACa,iBAAiB,CAC/B,MAAM,EAAE,cAAc,EACtB,IAAI,EAAE,cAAc,GACnB,OAAO,CAAC,IAAI,CAAC;IAoDhB;;;;;;;;OAQG;cACa,YAAY,CAC1B,MAAM,EAAE,cAAc,EACtB,IAAI,EAAE,cAAc,GACnB,OAAO,CAAC,eAAe,CAAC;CAsD5B"}

package/out/ui-action/provider/front-ui-action-provider.js

@@ -3,6 +3,7 @@ import { mergeRight } from 'ramda';
 import { OpenAppViewCommand } from '../../command';
 import { ScriptFactory } from '../../utils';
 import { UIActionProviderBase } from './ui-action-provider-base';
+import { openDataImport } from '../../controller/utils';
 /**
  * 前台调用界面行为适配器
  *
@@ -150,34 +151,23 @@ export class FrontUIActionProvider extends UIActionProviderBase {
      * @return {*}
      */
     async executeDataImport(action, args) {
-        var _a;
         // 处理参数
         const { resultContext, resultParams } = await this.handleParams(action, args.context, args.data, args.params);
-        const appDataEntity = await ibiz.hub.getAppDataEntity(action.appDataEntityId, action.appId);
-        const appDEDataImport = (_a = appDataEntity.appDEDataImports) === null || _a === void 0 ? void 0 : _a.find(dataImport => dataImport.id === action.appDEDataImportId);
-        let importName = 'DataImport';
-        if (appDEDataImport && appDEDataImport.enableCustomized) {
-            importName = 'DataImport2';
-        }
-        if (appDEDataImport) {
-            const modal = ibiz.overlay.createModal(importName, {
-                dismiss: () => modal.dismiss(),
-                appDataEntity,
-                dataImport: appDEDataImport,
-                context: resultContext,
-                params: resultParams,
-            }, {
-                width: 'auto',
-                placement: 'center',
-            });
-            modal.present();
-            await modal.onWillDismiss();
-            return {
-                refresh: true,
-                refreshMode: 1,
-            };
+        const { appDataEntityId, appDEDataImportId, frontAppViewId } = action;
+        if (!appDataEntityId || !appDEDataImportId) {
+            throw new RuntimeModelError(action, '没有配置导入模型！');
         }
-        throw new RuntimeError('没有找到实体导入项');
+        await openDataImport({
+            appDataEntityId,
+            deDataImportId: appDEDataImportId,
+            dataImportViewId: frontAppViewId,
+            context: resultContext,
+            params: resultParams,
+        });
+        return {
+            refresh: true,
+            refreshMode: 1,
+        };
     }
     /**
      * 执行导出行为
@@ -253,7 +243,8 @@ export class FrontUIActionProvider extends UIActionProviderBase {
             context: resultContext,
             params: resultParams,
             modelData: action.deeditForm,
-            onSaveSuccess: () => {
+            onSaveSuccess: (eventArgs) => {
+                actionResult.data = [eventArgs.args];
                 if (overlay) {
                     overlay.dismiss();
                 }