@ibiz-template/runtime 0.7.41-alpha.5 → 0.7.41-alpha.6

package/out/service/vo/code-list-data-item/code-list-data-item.js

@@ -118,7 +118,9 @@ export class CodeListDataItem {
         // 数据属性
         if (dataAppDEFieldId && this.$origin[dataAppDEFieldId]) {
             try {
-                this.data = ScriptFactory.execSingleLine(dataAppDEFieldId, this.$origin);
+                this.data = ScriptFactory.execSingleLine(dataAppDEFieldId, this.$origin instanceof AppDataEntity
+                    ? clone(this.$origin._data)
+                    : clone(this.$origin));
             }
             catch (error) {
                 ibiz.log.error(ibiz.i18n.t('runtime.service.dynamicCodeTable'));
@@ -170,6 +172,11 @@ export class CodeListDataItem {
             enumerable: true,
             configurable: true,
         });
+        // 其它未处理字段
+        this.children = undefined;
+        this.cls = undefined;
+        this.tooltip = undefined;
+        this.userData = undefined;
         // 关联其它属性，用于使用实体属性也要取到值的场景。
         Object.keys(data instanceof AppDataEntity ? clone(data._data) : clone(data)).forEach(key => {
             if (!Object.prototype.hasOwnProperty.call(this, key))

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

@@ -7,6 +7,25 @@ import { IApiFileUtil } from '../../interface';
  * @implements {IApiFileUtil}
  */
 export declare class FileUtil implements IApiFileUtil {
+    /**
+     * @description 自定义文件上传请求头数据
+     * @protected
+     * @type {Record<string, string>}
+     * @memberof FileUtil
+     */
+    protected customUploadHeaders: Record<string, string>;
+    /**
+     * @description 设置文件上传请求头数据
+     * @param {Record<string, string>} args
+     * @memberof FileUtil
+     */
+    setUploadHeaders(args: Record<string, string>): void;
+    /**
+     * @description 获取文件上传请求头数据
+     * @returns {*}  {Record<string, string>}
+     * @memberof IApiFileUtil
+     */
+    getUploadHeaders(): Record<string, string>;
     /**
      * @description 计算OSSCat参数
      * @protected
@@ -18,9 +37,7 @@ export declare class FileUtil implements IApiFileUtil {
      */
     protected calcOSSCatUrl(url: string, context: IContext, OSSCatName?: string): string;
     /**
-     * @description 计算文件的上传路径和下载路径
-     * 下载路径文件id用%fileId%占位，替换即可
-     * 配置编辑器参数uploadParams和exportParams时，会像导航参数一样动态添加对应的参数到url上
+     * @description 计算文件的上传路径和下载路径,下载路径文件id用%fileId%占位，替换即可;配置编辑器参数uploadParams和exportParams时，会像导航参数一样动态添加对应的参数到url上
      * @param {IContext} context
      * @param {IParams} params
      * @param {IData} [data={}]

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

@@ -1 +1 @@
-{"version":3,"file":"file-util.d.ts","sourceRoot":"","sources":["../../../src/utils/file-util/file-util.ts"],"names":[],"mappings":"AAAA,OAAO,EAEL,aAAa,EAId,MAAM,qBAAqB,CAAC;AAG7B,OAAO,EAAE,YAAY,EAAE,MAAM,iBAAiB,CAAC;AAE/C;;;;;GAKG;AACH,qBAAa,QAAS,YAAW,YAAY;IAC3C;;;;;;;;OAQG;IACH,SAAS,CAAC,aAAa,CACrB,GAAG,EAAE,MAAM,EACX,OAAO,EAAE,QAAQ,EACjB,UAAU,CAAC,EAAE,MAAM,GAClB,MAAM;IAWT;;;;;;;;;;;;;OAaG;IACH,iBAAiB,CACf,OAAO,EAAE,QAAQ,EACjB,MAAM,EAAE,OAAO,EACf,IAAI,GAAE,KAAU,EAChB,WAAW,GAAE,KAAU,GACtB;QACD,SAAS,EAAE,MAAM,CAAC;QAClB,WAAW,EAAE,MAAM,CAAC;KACrB;IA0BD;;;;;;OAMG;IACG,YAAY,CAAC,GAAG,EAAE,MAAM,EAAE,IAAI,CAAC,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC;IAuB7D;;;;;;;OAOG;IACG,UAAU,CACd,SAAS,EAAE,MAAM,EACjB,IAAI,EAAE,IAAI,EACV,OAAO,EAAE,KAAK,GACb,OAAO,CAAC,KAAK,CAAC;IAiBjB;;;;;OAKG;IACH,WAAW,CAAC,QAAQ,EAAE,aAAa,CAAC,KAAK,CAAC,GAAG,MAAM;IAmBnD;;;;;;;;OAQG;IACG,mBAAmB,CACvB,OAAO,EAAE,QAAQ,EACjB,MAAM,EAAE,OAAO,EACf,IAAI,EAAE,KAAK,EACX,MAAM,GAAE,KAAU,GACjB,OAAO,CAAC,KAAK,EAAE,CAAC;IA+BnB;;;;;;OAMG;IACH,UAAU,CACR,MAAM,GAAE,MAAW,EACnB,QAAQ,GAAE,OAAe,GACxB,OAAO,CAAC,QAAQ,CAAC;CAuBrB"}
+{"version":3,"file":"file-util.d.ts","sourceRoot":"","sources":["../../../src/utils/file-util/file-util.ts"],"names":[],"mappings":"AACA,OAAO,EAEL,aAAa,EAId,MAAM,qBAAqB,CAAC;AAG7B,OAAO,EAAE,YAAY,EAAE,MAAM,iBAAiB,CAAC;AAE/C;;;;;GAKG;AACH,qBAAa,QAAS,YAAW,YAAY;IAC3C;;;;;OAKG;IACH,SAAS,CAAC,mBAAmB,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,CAAM;IAE3D;;;;OAIG;IACH,gBAAgB,CAAC,IAAI,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,GAAG,IAAI;IAIpD;;;;OAIG;IACH,gBAAgB,IAAI,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC;IAqB1C;;;;;;;;OAQG;IACH,SAAS,CAAC,aAAa,CACrB,GAAG,EAAE,MAAM,EACX,OAAO,EAAE,QAAQ,EACjB,UAAU,CAAC,EAAE,MAAM,GAClB,MAAM;IAWT;;;;;;;;;;;OAWG;IACH,iBAAiB,CACf,OAAO,EAAE,QAAQ,EACjB,MAAM,EAAE,OAAO,EACf,IAAI,GAAE,KAAU,EAChB,WAAW,GAAE,KAAU,GACtB;QACD,SAAS,EAAE,MAAM,CAAC;QAClB,WAAW,EAAE,MAAM,CAAC;KACrB;IA0BD;;;;;;OAMG;IACG,YAAY,CAAC,GAAG,EAAE,MAAM,EAAE,IAAI,CAAC,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC;IAuB7D;;;;;;;OAOG;IACG,UAAU,CACd,SAAS,EAAE,MAAM,EACjB,IAAI,EAAE,IAAI,EACV,OAAO,EAAE,KAAK,GACb,OAAO,CAAC,KAAK,CAAC;IAiBjB;;;;;OAKG;IACH,WAAW,CAAC,QAAQ,EAAE,aAAa,CAAC,KAAK,CAAC,GAAG,MAAM;IAmBnD;;;;;;;;OAQG;IACG,mBAAmB,CACvB,OAAO,EAAE,QAAQ,EACjB,MAAM,EAAE,OAAO,EACf,IAAI,EAAE,KAAK,EACX,MAAM,GAAE,KAAU,GACjB,OAAO,CAAC,KAAK,EAAE,CAAC;IA8BnB;;;;;;OAMG;IACH,UAAU,CACR,MAAM,GAAE,MAAW,EACnB,QAAQ,GAAE,OAAe,GACxB,OAAO,CAAC,QAAQ,CAAC;CAuBrB"}

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

@@ -1,3 +1,4 @@
+/* eslint-disable @typescript-eslint/no-unused-vars */
 import { CoreConst, RuntimeError, downloadFileFromBlob, getAppCookie, } from '@ibiz-template/core';
 import qs from 'qs';
 import { convertNavData } from '../nav-params/nav-params';
@@ -8,6 +9,44 @@ import { convertNavData } from '../nav-params/nav-params';
  * @implements {IApiFileUtil}
  */
 export class FileUtil {
+    constructor() {
+        /**
+         * @description 自定义文件上传请求头数据
+         * @protected
+         * @type {Record<string, string>}
+         * @memberof FileUtil
+         */
+        this.customUploadHeaders = {};
+    }
+    /**
+     * @description 设置文件上传请求头数据
+     * @param {Record<string, string>} args
+     * @memberof FileUtil
+     */
+    setUploadHeaders(args) {
+        Object.assign(this.customUploadHeaders, args);
+    }
+    /**
+     * @description 获取文件上传请求头数据
+     * @returns {*}  {Record<string, string>}
+     * @memberof IApiFileUtil
+     */
+    getUploadHeaders() {
+        const uploadHeaders = {};
+        // 预定义请求头数据
+        const token = getAppCookie(CoreConst.TOKEN);
+        if (token) {
+            Object.assign(uploadHeaders, {
+                [`${ibiz.env.tokenHeader}Authorization`]: `${ibiz.env.tokenPrefix}Bearer ${token}`,
+            });
+        }
+        // 自定义请求头数据
+        if (this.customUploadHeaders &&
+            Object.keys(this.customUploadHeaders).length > 0) {
+            Object.assign(uploadHeaders, Object.assign({}, this.customUploadHeaders));
+        }
+        return uploadHeaders;
+    }
     /**
      * @description 计算OSSCat参数
      * @protected
@@ -28,9 +67,7 @@ export class FileUtil {
         return uploadUrl;
     }
     /**
-     * @description 计算文件的上传路径和下载路径
-     * 下载路径文件id用%fileId%占位，替换即可
-     * 配置编辑器参数uploadParams和exportParams时，会像导航参数一样动态添加对应的参数到url上
+     * @description 计算文件的上传路径和下载路径,下载路径文件id用%fileId%占位，替换即可;配置编辑器参数uploadParams和exportParams时，会像导航参数一样动态添加对应的参数到url上
      * @param {IContext} context
      * @param {IParams} params
      * @param {IData} [data={}]
@@ -144,17 +181,11 @@ export class FileUtil {
      * @memberof FileUtil
      */
     async chooseFileAndUpload(context, params, data, option = {}) {
-        const { accept, multiple, showUploadManager } = option;
-        const urls = ibiz.util.file.calcFileUpDownUrl(context, params, data);
+        const { accept, multiple, showUploadManager, extraParams } = option;
+        const urls = ibiz.util.file.calcFileUpDownUrl(context, params, data, extraParams);
         const files = await ibiz.util.file.chooseFile(accept, multiple);
         let promises = [];
-        const headers = {};
-        const token = getAppCookie(CoreConst.TOKEN);
-        if (token) {
-            Object.assign(headers, {
-                [`${ibiz.env.tokenHeader}Authorization`]: `${ibiz.env.tokenPrefix}Bearer ${token}`,
-            });
-        }
+        const headers = this.getUploadHeaders();
         if (showUploadManager) {
             promises = await ibiz.notification.uploadManager({
                 uploadUrl: urls.uploadUrl,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@ibiz-template/runtime",
-  "version": "0.7.41-alpha.5",
+  "version": "0.7.41-alpha.6",
   "description": "运行时逻辑库",
   "type": "module",
   "main": "out/index.js",
@@ -68,5 +68,5 @@
     "qx-util": "^0.4.8",
     "ramda": "^0.29.0"
   },
-  "gitHead": "95d8b20bb9c6d513b424e78ed634599b26966801"
+  "gitHead": "3dc00c15d9f7721680f275880724f0a823385faf"
 }