@ibiz-template/runtime 0.7.2 → 0.7.3

package/out/controller/common/view/app-data-upload-view.controller.d.ts

@@ -18,5 +18,19 @@ export declare class AppDataUploadViewController<T extends IAppView = IAppView,
      * @return {*}
      */
     selectAndImport(): Promise<ImportDataResult>;
+    /**
+     * 自定义导入数据方法
+     * @author lxm
+     * @date 2024-04-18 05:17:22
+     * @param {{
+     *     fileId: string;
+     *     schemaId: string;
+     *   }} opts
+     * @return {*}  {Promise<void>}
+     */
+    asyncImportData2(opts: {
+        fileId: string;
+        schemaId: string;
+    }): Promise<void>;
 }
 //# sourceMappingURL=app-data-upload-view.controller.d.ts.map

package/out/controller/common/view/app-data-upload-view.controller.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"app-data-upload-view.controller.d.ts","sourceRoot":"","sources":["../../../../src/controller/common/view/app-data-upload-view.controller.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,QAAQ,EAAE,MAAM,kBAAkB,CAAC;AAC5C,OAAO,EACL,uBAAuB,EACvB,eAAe,EACf,UAAU,EACX,MAAM,oBAAoB,CAAC;AAC5B,OAAO,EAAE,cAAc,EAAE,MAAM,mBAAmB,CAAC;AACnD,OAAO,EACL,gBAAgB,EAIjB,MAAM,aAAa,CAAC;AAErB,qBAAa,2BAA2B,CACpC,CAAC,SAAS,QAAQ,GAAG,QAAQ,EAC7B,CAAC,SAAS,uBAAuB,GAAG,uBAAuB,EAC3D,CAAC,SAAS,UAAU,GAAG,UAAU,CAEnC,SAAQ,cAAc,CAAC,CAAC,EAAE,CAAC,EAAE,CAAC,CAC9B,YAAW,eAAe,CAAC,CAAC,EAAE,CAAC,EAAE,CAAC,CAAC;IAEnC,SAAS,CAAC,SAAS,IAAI,IAAI;cAIX,SAAS,IAAI,OAAO,CAAC,IAAI,CAAC;IAc1C;;;;OAIG;IACH,gBAAgB,IAAI,IAAI;IAKxB;;;;;OAKG;IACG,eAAe,IAAI,OAAO,CAAC,gBAAgB,CAAC;CAYnD"}
+{"version":3,"file":"app-data-upload-view.controller.d.ts","sourceRoot":"","sources":["../../../../src/controller/common/view/app-data-upload-view.controller.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,QAAQ,EAAE,MAAM,kBAAkB,CAAC;AAC5C,OAAO,EACL,uBAAuB,EACvB,eAAe,EACf,UAAU,EACX,MAAM,oBAAoB,CAAC;AAC5B,OAAO,EAAE,cAAc,EAAE,MAAM,mBAAmB,CAAC;AACnD,OAAO,EACL,gBAAgB,EAKjB,MAAM,aAAa,CAAC;AAErB,qBAAa,2BAA2B,CACpC,CAAC,SAAS,QAAQ,GAAG,QAAQ,EAC7B,CAAC,SAAS,uBAAuB,GAAG,uBAAuB,EAC3D,CAAC,SAAS,UAAU,GAAG,UAAU,CAEnC,SAAQ,cAAc,CAAC,CAAC,EAAE,CAAC,EAAE,CAAC,CAC9B,YAAW,eAAe,CAAC,CAAC,EAAE,CAAC,EAAE,CAAC,CAAC;IAEnC,SAAS,CAAC,SAAS,IAAI,IAAI;cAIX,SAAS,IAAI,OAAO,CAAC,IAAI,CAAC;IAc1C;;;;OAIG;IACH,gBAAgB,IAAI,IAAI;IAKxB;;;;;OAKG;IACG,eAAe,IAAI,OAAO,CAAC,gBAAgB,CAAC;IAalD;;;;;;;;;OASG;IACG,gBAAgB,CAAC,IAAI,EAAE;QAC3B,MAAM,EAAE,MAAM,CAAC;QACf,QAAQ,EAAE,MAAM,CAAC;KAClB,GAAG,OAAO,CAAC,IAAI,CAAC;CAQlB"}

package/out/controller/common/view/app-data-upload-view.controller.js

@@ -1,5 +1,5 @@
 import { ViewController } from './view.controller';
-import { downloadImportTemplate, getDataImportModels, selectAndImport, } from '../../utils';
+import { asyncImportData2, downloadImportTemplate, getDataImportModels, selectAndImport, } from '../../utils';
 export class AppDataUploadViewController extends ViewController {
     initState() {
         super.initState();
@@ -43,4 +43,17 @@ export class AppDataUploadViewController extends ViewController {
         }
         return result;
     }
+    /**
+     * 自定义导入数据方法
+     * @author lxm
+     * @date 2024-04-18 05:17:22
+     * @param {{
+     *     fileId: string;
+     *     schemaId: string;
+     *   }} opts
+     * @return {*}  {Promise<void>}
+     */
+    async asyncImportData2(opts) {
+        return asyncImportData2(Object.assign({ appDataEntity: this.state.appDataEntity, dataImport: this.state.deDataImport, context: this.context }, opts));
+    }
 }

package/out/controller/common/view/view.controller.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"view.controller.d.ts","sourceRoot":"","sources":["../../../../src/controller/common/view/view.controller.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"view.controller.d.ts","sourceRoot":"","sources":["../../../../src/controller/common/view/view.controller.ts"],"names":[],"mappings":"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"}

package/out/controller/common/view/view.controller.js

@@ -381,6 +381,11 @@ export class ViewController extends BaseController {
         const modalParams = {
             title: message.title,
             desc: message.message,
+            // todo 待模型修复
+            // options: {
+            //   showClose: message.removeMode !== 0,
+            //   showConfirmButton: message.removeMode !== 0,
+            // },
         };
         // userTag为确认按钮文本
         if (message.extraParams.userTag) {

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

@@ -1,3 +1,4 @@
+import { IHttpResponse } from '@ibiz-template/core';
 import { IAppDEDataImport, IAppDataEntity } from '@ibiz/model-core';
 export type ImportDataResult = {
     /**
@@ -135,4 +136,121 @@ export declare function selectAndImport(opts: {
     dataImport?: IAppDEDataImport;
     context?: IContext;
 }): Promise<ImportDataResult>;
+/**
+ * 自定义导入数据方法
+ * @author lxm
+ * @date 2024-04-18 03:30:46
+ * @export
+ * @param {{
+ *   appDataEntity: IAppDataEntity;
+ *   context?: IContext;
+ *   fileId: string; 导入文件id
+ *   schemaId: string; 导入模版id
+ * }} opts
+ */
+export declare function asyncImportData2(opts: {
+    appDataEntity: IAppDataEntity;
+    dataImport?: IAppDEDataImport;
+    context?: IContext;
+    fileId: string;
+    schemaId: string;
+}): Promise<void>;
+export type ImportSchemaField = {
+    name: string;
+    index: number;
+    caption: string;
+};
+export type ImportSchemaData = {
+    id?: string;
+    name: string;
+    fields: ImportSchemaField[];
+    system_tag: string;
+    data_entity_tag: string;
+    import_tag: string;
+    owner_type: string;
+};
+/**
+ * 计算导入模型的schema数据
+ * @author lxm
+ * @date 2024-04-18 04:29:36
+ * @export
+ * @param {{
+ *   appDataEntity?: IAppDataEntity;
+ *   dataImport?: IAppDEDataImport;
+ *   data: Partial<ImportSchemaData>;
+ * }} opts
+ * @return {*}  {ImportSchemaData}
+ */
+export declare function calcImportSchemaData(opts: {
+    appDataEntity?: IAppDataEntity;
+    dataImport?: IAppDEDataImport;
+    data: Partial<ImportSchemaData>;
+}): ImportSchemaData;
+/**
+ * 创建新的schema
+ * @author lxm
+ * @date 2024-04-18 04:26:03
+ * @export
+ * @param {{
+ *   appDataEntity?: IAppDataEntity;
+ *   dataImport?: IAppDEDataImport;
+ *   data: Partial<ImportSchemaData>;
+ * }} opts
+ * @return {*}
+ */
+export declare function createImportSchema(opts: {
+    appDataEntity?: IAppDataEntity;
+    dataImport?: IAppDEDataImport;
+    data: Partial<ImportSchemaData>;
+}): Promise<IHttpResponse<IData>>;
+/**
+ * 更新已有的schema
+ * @author lxm
+ * @date 2024-04-18 04:26:03
+ * @export
+ * @param {{
+ *   appDataEntity?: IAppDataEntity;
+ *   dataImport?: IAppDEDataImport;
+ *   data: Partial<ImportSchemaData>;
+ * }} opts
+ * @return {*}
+ */
+export declare function updateImportSchema(opts: {
+    appDataEntity?: IAppDataEntity;
+    dataImport?: IAppDEDataImport;
+    data: Partial<ImportSchemaData>;
+}): Promise<IHttpResponse<IData>>;
+/**
+ * 获取指定id的schema数据
+ * @author lxm
+ * @date 2024-04-18 04:47:03
+ * @export
+ * @param {string} id
+ * @return {*}  {Promise<IHttpResponse<IData>>}
+ */
+export declare function getImportSchema(id: string): Promise<IHttpResponse<IData>>;
+/**
+ * 删除指定id的schema数据
+ * @author lxm
+ * @date 2024-04-18 04:47:03
+ * @export
+ * @param {string} id
+ * @return {*}  {Promise<IHttpResponse<IData>>}
+ */
+export declare function deleteImportSchema(id: string): Promise<IHttpResponse<IData>>;
+/**
+ * 获取当前用户的指定实体和实体导入的schema集合数据
+ * @author lxm
+ * @date 2024-04-18 04:53:25
+ * @export
+ * @param {{
+ *   appDataEntity: IAppDataEntity;
+ *   dataImport?: IAppDEDataImport;
+ * }} opts
+ * @return {*}  {Promise<IHttpResponse<IData[]>>}
+ */
+export declare function fetchImportSchemas(opts: {
+    appDataEntity: IAppDataEntity;
+    dataImport?: IAppDEDataImport;
+}): Promise<IHttpResponse<IData[]>>;
 //# 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":"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"}
+{"version":3,"file":"data-file-util.d.ts","sourceRoot":"","sources":["../../../../src/controller/utils/data-file-util/data-file-util.ts"],"names":[],"mappings":"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"}

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

@@ -1,4 +1,5 @@
 import { RuntimeError, selectFile, } from '@ibiz-template/core';
+import { mergeRight } from 'ramda';
 import { calcResPath } from '../../../service';
 import { OpenAppViewCommand } from '../../../command';
 // 异步导入URL
@@ -307,3 +308,161 @@ export async function selectAndImport(opts) {
         });
     });
 }
+// 自定义导入相关
+/**
+ * 自定义导入数据方法
+ * @author lxm
+ * @date 2024-04-18 03:30:46
+ * @export
+ * @param {{
+ *   appDataEntity: IAppDataEntity;
+ *   context?: IContext;
+ *   fileId: string; 导入文件id
+ *   schemaId: string; 导入模版id
+ * }} opts
+ */
+export async function asyncImportData2(opts) {
+    var _a;
+    let path = `/${opts.appDataEntity.codeName2.toLowerCase()}`;
+    if (opts.context) {
+        const resPath = calcResPath(opts.context, opts.appDataEntity);
+        path = resPath + path;
+    }
+    const url = `${path}/asyncimportdata2`;
+    const queryData = {
+        srfossfileid: opts.fileId,
+        srfimportschemaid: opts.schemaId,
+    };
+    // 导入模型
+    const srfimporttag = ((_a = opts.dataImport) === null || _a === void 0 ? void 0 : _a.id) || opts.appDataEntity.defaultAppDEDataImportId;
+    if (srfimporttag) {
+        Object.assign(queryData, { srfimporttag });
+    }
+    await ibiz.net.request(url, {
+        method: 'get',
+        params: queryData,
+    });
+    ibiz.notification.info({
+        desc: ibiz.i18n.t('component.dataImport.startImport'),
+    });
+}
+/**
+ * 计算导入模型的schema数据
+ * @author lxm
+ * @date 2024-04-18 04:29:36
+ * @export
+ * @param {{
+ *   appDataEntity?: IAppDataEntity;
+ *   dataImport?: IAppDEDataImport;
+ *   data: Partial<ImportSchemaData>;
+ * }} opts
+ * @return {*}  {ImportSchemaData}
+ */
+export function calcImportSchemaData(opts) {
+    var _a, _b, _c, _d;
+    let data = {
+        system_tag: (_a = ibiz.appData) === null || _a === void 0 ? void 0 : _a.context.srfsystemid, // 系统标记
+        data_entity_tag: (_b = opts.appDataEntity) === null || _b === void 0 ? void 0 : _b.codeName, // 数据实体标记
+        import_tag: ((_c = opts.dataImport) === null || _c === void 0 ? void 0 : _c.id) || ((_d = opts.appDataEntity) === null || _d === void 0 ? void 0 : _d.defaultAppDEDataImportId), // 导入标记 导入模型的代码名称
+        owner_type: 'PERSONAL', // 所有者类型
+    };
+    data = mergeRight(data, opts.data);
+    return data;
+}
+/**
+ * 创建新的schema
+ * @author lxm
+ * @date 2024-04-18 04:26:03
+ * @export
+ * @param {{
+ *   appDataEntity?: IAppDataEntity;
+ *   dataImport?: IAppDEDataImport;
+ *   data: Partial<ImportSchemaData>;
+ * }} opts
+ * @return {*}
+ */
+export async function createImportSchema(opts) {
+    const data = calcImportSchemaData(opts);
+    const url = `extension/import_schemas`;
+    const res = await ibiz.net.request(url, {
+        method: 'post',
+        data,
+    });
+    return res;
+}
+/**
+ * 更新已有的schema
+ * @author lxm
+ * @date 2024-04-18 04:26:03
+ * @export
+ * @param {{
+ *   appDataEntity?: IAppDataEntity;
+ *   dataImport?: IAppDEDataImport;
+ *   data: Partial<ImportSchemaData>;
+ * }} opts
+ * @return {*}
+ */
+export async function updateImportSchema(opts) {
+    const data = calcImportSchemaData(opts);
+    const url = `extension/import_schemas/${data.id}`;
+    const res = await ibiz.net.request(url, {
+        method: 'put',
+        data,
+    });
+    return res;
+}
+/**
+ * 获取指定id的schema数据
+ * @author lxm
+ * @date 2024-04-18 04:47:03
+ * @export
+ * @param {string} id
+ * @return {*}  {Promise<IHttpResponse<IData>>}
+ */
+export async function getImportSchema(id) {
+    const url = `extension/import_schemas/${id}`;
+    const res = await ibiz.net.request(url, {
+        method: 'get',
+    });
+    return res;
+}
+/**
+ * 删除指定id的schema数据
+ * @author lxm
+ * @date 2024-04-18 04:47:03
+ * @export
+ * @param {string} id
+ * @return {*}  {Promise<IHttpResponse<IData>>}
+ */
+export async function deleteImportSchema(id) {
+    const url = `extension/import_schemas/${id}`;
+    const res = await ibiz.net.request(url, {
+        method: 'delete',
+    });
+    return res;
+}
+/**
+ * 获取当前用户的指定实体和实体导入的schema集合数据
+ * @author lxm
+ * @date 2024-04-18 04:53:25
+ * @export
+ * @param {{
+ *   appDataEntity: IAppDataEntity;
+ *   dataImport?: IAppDEDataImport;
+ * }} opts
+ * @return {*}  {Promise<IHttpResponse<IData[]>>}
+ */
+export async function fetchImportSchemas(opts) {
+    var _a;
+    const params = {
+        n_import_tag_eq: opts.appDataEntity.defaultAppDEDataImportId,
+        n_system_tag_eq: (_a = ibiz.appData) === null || _a === void 0 ? void 0 : _a.context.srfsystemid,
+        n_data_entity_tag_eq: opts.appDataEntity.codeName,
+    };
+    const url = `extension/import_schemas/fetch_cur_user`;
+    const res = await ibiz.net.request(url, {
+        method: 'post',
+        data: params,
+    });
+    return res;
+}

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/service/utils/dynamic-code-list/dynamic-code-list.js

@@ -177,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) {

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/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@ibiz-template/runtime",
-  "version": "0.7.2",
+  "version": "0.7.3",
   "description": "控制器包",
   "type": "module",
   "main": "out/index.js",
@@ -35,7 +35,7 @@
     "animejs": "^3.2.2"
   },
   "devDependencies": {
-    "@ibiz-template/core": "^0.7.2",
+    "@ibiz-template/core": "^0.7.3",
     "@ibiz/model-core": "^0.1.20",
     "@types/animejs": "^3.1.12",
     "@types/path-browserify": "^1.0.2",