@ibiz-template/runtime 0.7.39 → 0.7.40

package/out/service/service/util/util.service.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"util.service.d.ts","sourceRoot":"","sources":["../../../../src/service/service/util/util.service.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,cAAc,EAAE,QAAQ,EAAE,MAAM,kBAAkB,CAAC;AAC5D,OAAO,EAAE,aAAa,EAAE,MAAM,oBAAoB,CAAC;AAEnD;;;;;;;GAOG;AACH,qBAAa,WAAW;IAyBV,SAAS,CAAC,OAAO,EAAE,QAAQ;IAxBvC;;;;;;OAMG;IACH,SAAS,CAAC,mBAAmB,EAAE,cAAc,GAAG,IAAI,CAAQ;IAE5D;;;;;;OAMG;IACH,SAAS,CAAC,YAAY,EAAE,aAAa,GAAG,IAAI,CAAQ;IAEpD;;;;;OAKG;gBACmB,OAAO,EAAE,QAAQ;IAEvC;;;;;;;;;OASG;YACW,eAAe;IAgC7B;;;;;;;;;OASG;IACG,IAAI,CAAC,GAAG,EAAE,MAAM,EAAE,OAAO,EAAE,QAAQ,EAAE,MAAM,EAAE,OAAO,GAAG,OAAO,CAAC,KAAK,CAAC;IAkB3E;;;;;;;;;;OAUG;IACG,IAAI,CACR,GAAG,EAAE,MAAM,EACX,OAAO,EAAE,QAAQ,EACjB,MAAM,EAAE,OAAO,EACf,IAAI,EAAE,KAAK,GACV,OAAO,CAAC,KAAK,CAAC;IAUjB;;;;;;;;;;OAUG;IACH,OAAO,CAAC,iBAAiB;IAmCzB;;;;;;;;OAQG;IACH,OAAO,CAAC,cAAc;CAKvB"}
+{"version":3,"file":"util.service.d.ts","sourceRoot":"","sources":["../../../../src/service/service/util/util.service.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,cAAc,EAAE,QAAQ,EAAE,MAAM,kBAAkB,CAAC;AAC5D,OAAO,EAAE,aAAa,EAAE,MAAM,oBAAoB,CAAC;AAEnD;;;;;;;GAOG;AACH,qBAAa,WAAW;IAyBV,SAAS,CAAC,OAAO,EAAE,QAAQ;IAxBvC;;;;;;OAMG;IACH,SAAS,CAAC,mBAAmB,EAAE,cAAc,GAAG,IAAI,CAAQ;IAE5D;;;;;;OAMG;IACH,SAAS,CAAC,YAAY,EAAE,aAAa,GAAG,IAAI,CAAQ;IAEpD;;;;;OAKG;gBACmB,OAAO,EAAE,QAAQ;IAEvC;;;;;;;;;OASG;YACW,eAAe;IA4C7B;;;;;;;;;OASG;IACG,IAAI,CAAC,GAAG,EAAE,MAAM,EAAE,OAAO,EAAE,QAAQ,EAAE,MAAM,EAAE,OAAO,GAAG,OAAO,CAAC,KAAK,CAAC;IAkC3E;;;;;;;;;;OAUG;IACG,IAAI,CACR,GAAG,EAAE,MAAM,EACX,OAAO,EAAE,QAAQ,EACjB,MAAM,EAAE,OAAO,EACf,IAAI,EAAE,KAAK,GACV,OAAO,CAAC,KAAK,CAAC;IAsBjB;;;;;;;;;;OAUG;IACH,OAAO,CAAC,iBAAiB;IAmCzB;;;;;;OAMG;IACH,OAAO,CAAC,qBAAqB;IA0B7B;;;;;OAKG;IACH,OAAO,CAAC,mBAAmB;IAgC3B;;;;;;;;OAQG;IACH,OAAO,CAAC,cAAc;IAMtB;;;;;;OAMG;IACH,OAAO,CAAC,kBAAkB;CA0B3B"}

package/out/service/service/util/util.service.js

@@ -46,18 +46,22 @@ export class UtilService {
         if (this.appDEService) {
             return this.appDEService;
         }
-        const { appId, name, stoageAppDataEntityId } = this.appUtil;
-        if (appId && stoageAppDataEntityId) {
+        const { appId, name, stoageAppDataEntityId, utilTag, utilType, utilDEName, } = this.appUtil;
+        // 自定义功能类型且功能标记不走DYNAMENU获取utilDEName作为实体标识
+        const appDataEntityTag = utilType === 'USER' && utilTag !== 'DYNAMENU'
+            ? utilDEName
+            : stoageAppDataEntityId;
+        if (appId && appDataEntityTag) {
             const app = ibiz.hub.getApp(appId);
-            this.stoageAppDataEntity = await ibiz.hub.getAppDataEntity(stoageAppDataEntityId, appId);
-            const appDEService = await app.deService.getService(context, stoageAppDataEntityId);
+            this.stoageAppDataEntity = await ibiz.hub.getAppDataEntity(appDataEntityTag, appId);
+            const appDEService = await app.deService.getService(context, appDataEntityTag);
             if (appDEService) {
                 this.appDEService = appDEService;
                 return appDEService;
             }
             throw new Error(ibiz.i18n.t('runtime.service.noFoundStorageEntity', {
                 name,
-                stoageAppDataEntityId,
+                stoageAppDataEntityId: appDataEntityTag,
             }));
         }
         throw new Error(ibiz.i18n.t('runtime.service.noExist', { name }));
@@ -73,17 +77,31 @@ export class UtilService {
      * @return {*}  {Promise<IData>}
      */
     async load(tag, context, params) {
-        const tempContext = context.clone();
-        const dataService = await this.getAppDEService(tempContext);
-        // 设置数据主键
-        tempContext[this.stoageAppDataEntity.codeName.toLowerCase()] = tag;
-        const { getAppDEActionId } = this.appUtil;
-        try {
-            const res = await dataService.exec(getAppDEActionId || 'get', tempContext, params);
-            return this.handleResponse(res);
+        const { utilType, utilTag } = this.appUtil;
+        if (utilType === 'USER' && utilTag !== 'DYNAMENU') {
+            try {
+                const { getAppDEActionId } = this.parseUserUtilParams();
+                const dataService = await this.getAppDEService(context);
+                const res = await dataService.exec(getAppDEActionId, context, params);
+                return this.handleUserResponse(res);
+            }
+            catch (error) {
+                return {};
+            }
         }
-        catch (error) {
-            return {};
+        else {
+            const tempContext = context.clone();
+            const dataService = await this.getAppDEService(tempContext);
+            // 设置数据主键
+            tempContext[this.stoageAppDataEntity.codeName.toLowerCase()] = tag;
+            const { getAppDEActionId } = this.appUtil;
+            try {
+                const res = await dataService.exec(getAppDEActionId || 'get', tempContext, params);
+                return this.handleResponse(res);
+            }
+            catch (error) {
+                return {};
+            }
         }
     }
     /**
@@ -99,6 +117,13 @@ export class UtilService {
      */
     async save(tag, context, params, data) {
         const dataService = await this.getAppDEService(context);
+        const { utilType, utilTag } = this.appUtil;
+        if (utilType === 'USER' && utilTag !== 'DYNAMENU') {
+            const { saveAppDEActionId } = this.parseUserUtilParams();
+            const tempData = this.handleUserRequestData(data);
+            const res = await dataService.exec(saveAppDEActionId, context, tempData, params);
+            return this.handleUserResponse(res);
+        }
         const { context: tempContext, params: tempParams, data: tempData, } = this.handleRequestData(tag, context, params, data);
         return dataService.exec('save', tempContext, tempData, tempParams);
     }
@@ -134,6 +159,76 @@ export class UtilService {
         tempData.owner_id = params === null || params === void 0 ? void 0 : params.ownerId;
         return { context: tempContext, params, data: tempData };
     }
+    /**
+     * @description 处理自定义类型请求数据
+     * @private
+     * @param {(IData | IData[])} data
+     * @returns {*}  IData | IData[]
+     * @memberof UtilService
+     */
+    handleUserRequestData(data) {
+        const { modelMapping } = this.parseUserUtilParams();
+        let result;
+        const convertData = (sourceObj) => {
+            const targetObj = {};
+            if (Object.keys(modelMapping).length === 0) {
+                return sourceObj;
+            }
+            Object.keys(modelMapping).forEach(key => {
+                targetObj[modelMapping[key]] = sourceObj[key];
+            });
+            return targetObj;
+        };
+        if (!data) {
+            throw new Error(ibiz.i18n.t('runtime.service.dataException'));
+        }
+        if (Array.isArray(data) && data.length > 0) {
+            result = data.map(item => {
+                return convertData(item);
+            });
+            return result;
+        }
+        result = convertData(data);
+        return result;
+    }
+    /**
+     * @description 解析用户自定义功能参数(getAppDEActionId|saveAppDEActionId|modelMapping),分别表示获取行为|保存行为|数据映射关系
+     * @private
+     * @returns {*}  {IParams}
+     * @memberof UtilService
+     */
+    parseUserUtilParams() {
+        const { utilParams } = this.appUtil;
+        const result = {
+            getAppDEActionId: 'fetchDefault',
+            saveAppDEActionId: 'save',
+            modelMapping: {},
+        };
+        if (utilParams && Object.keys(utilParams).length > 0) {
+            Object.keys(utilParams).forEach(key => {
+                if (key !== 'appId') {
+                    // 数据映射关系格式如：id:appid|caption:display_name|order:order|dataId:id|indexViewName:index_id",key为界面定义字段名称，value为数据源字段名称
+                    if (key === 'modelMapping') {
+                        const modelMapping = {};
+                        if (utilParams.modelMapping) {
+                            const pairs = utilParams.modelMapping.split('|');
+                            pairs.forEach((pair) => {
+                                const [tempKey, tempVal] = pair.split(':');
+                                if (tempKey && tempVal) {
+                                    modelMapping[tempKey] = tempVal;
+                                }
+                            });
+                        }
+                        Object.assign(result, { [key]: modelMapping });
+                    }
+                    else {
+                        Object.assign(result, { [key]: utilParams[key] });
+                    }
+                }
+            });
+        }
+        return result;
+    }
     /**
      * 处理响应数据
      *
@@ -148,4 +243,37 @@ export class UtilService {
         const { modelAppDEFieldId } = this.appUtil;
         return JSON.parse(data[modelAppDEFieldId]);
     }
+    /**
+     * @description 处理自定义类型响应数据
+     * @private
+     * @param {IData[]} response
+     * @returns {*}  {IData | IData[]}
+     * @memberof UtilService
+     */
+    handleUserResponse(response) {
+        const { data } = response;
+        const { modelMapping } = this.parseUserUtilParams();
+        let result;
+        const convertData = (sourceObj) => {
+            const targetObj = {};
+            if (Object.keys(modelMapping).length === 0) {
+                return sourceObj;
+            }
+            Object.keys(modelMapping).forEach(key => {
+                targetObj[key] = sourceObj[modelMapping[key]];
+            });
+            return targetObj;
+        };
+        if (!data) {
+            throw new Error(ibiz.i18n.t('runtime.service.dataException'));
+        }
+        if (Array.isArray(data) && data.length > 0) {
+            result = data.map(item => {
+                return convertData(item);
+            });
+            return result;
+        }
+        result = convertData(data);
+        return result;
+    }
 }

package/out/service/utils/de-method-processer/de-method-processer.d.ts

@@ -0,0 +1,64 @@
+import { QXEvent } from 'qx-util';
+import { Method } from '../../service';
+import { IDeMethodProcesser, IMethodProcessState } from '../../../interface';
+/**
+ * @description 数据服务方法执行状态处理器
+ * @export
+ * @class DeMethodProcesser
+ */
+export declare class DeMethodProcesser implements IDeMethodProcesser {
+    protected srfSessionId: string;
+    /**
+     * @description 执行中方法数据
+     * @protected
+     * @type {Map<string, Method>} Map<执行标识，执行方法>
+     * @memberof DeMethodProcesser
+     */
+    protected data: Map<string, Method>;
+    /**
+     * Creates an instance of DeMethodProcesser.
+     * @param {string} srfSessionId
+     * @memberof DeMethodProcesser
+     */
+    constructor(srfSessionId: string);
+    /**
+     * @description 事件对象
+     * @protected
+     * @memberof DeMethodProcesser
+     */
+    protected evt: QXEvent<{
+        change: (data: IMethodProcessState) => void;
+    }>;
+    /**
+     * @description 增加执行中方法
+     * @param {string} key
+     * @param {Method} method
+     * @memberof DeMethodProcesser
+     */
+    increment(key: string, method: Method): void;
+    /**
+     * @description 减少执行中方法
+     * @param {string} key
+     * @memberof DeMethodProcesser
+     */
+    decrement(key: string): void;
+    /**
+     * @description 订阅选中变更
+     * @param {(data: IMethodProcessState) => void} cb 执行回调
+     * @returns {*}  {void}
+     * @memberof DeMethodProcesser
+     */
+    on(cb: (data: IMethodProcessState) => void): void;
+    /**
+     * @description 取消选中订阅
+     * @param {(data: IMethodProcessState) => void} cb 一定要确定，传进来要取消订阅的方法和订阅时方法在内存中指向的是同一个
+     * @memberof DeMethodProcesser
+     */
+    off(cb: (data: IMethodProcessState) => void): void;
+    /**
+     * @description 销毁
+     * @memberof DeMethodProcesser
+     */
+    destroy(): void;
+}
+//# sourceMappingURL=de-method-processer.d.ts.map

package/out/service/utils/de-method-processer/de-method-processer.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"de-method-processer.d.ts","sourceRoot":"","sources":["../../../../src/service/utils/de-method-processer/de-method-processer.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,OAAO,EAAE,MAAM,SAAS,CAAC;AAClC,OAAO,EAAE,MAAM,EAAE,MAAM,eAAe,CAAC;AACvC,OAAO,EAAE,kBAAkB,EAAE,mBAAmB,EAAE,MAAM,oBAAoB,CAAC;AAE7E;;;;GAIG;AACH,qBAAa,iBAAkB,YAAW,kBAAkB;IAc9C,SAAS,CAAC,YAAY,EAAE,MAAM;IAb1C;;;;;OAKG;IACH,SAAS,CAAC,IAAI,EAAE,GAAG,CAAC,MAAM,EAAE,MAAM,CAAC,CAAa;IAEhD;;;;OAIG;gBACmB,YAAY,EAAE,MAAM;IAE1C;;;;OAIG;IACH,SAAS,CAAC,GAAG,EAAE,OAAO,CAAC;QACrB,MAAM,EAAE,CAAC,IAAI,EAAE,mBAAmB,KAAK,IAAI,CAAC;KAC7C,CAAC,CAAiB;IAEnB;;;;;OAKG;IACH,SAAS,CAAC,GAAG,EAAE,MAAM,EAAE,MAAM,EAAE,MAAM,GAAG,IAAI;IAQ5C;;;;OAIG;IACH,SAAS,CAAC,GAAG,EAAE,MAAM,GAAG,IAAI;IAK5B;;;;;OAKG;IACH,EAAE,CAAC,EAAE,EAAE,CAAC,IAAI,EAAE,mBAAmB,KAAK,IAAI,GAAG,IAAI;IAIjD;;;;OAIG;IACH,GAAG,CAAC,EAAE,EAAE,CAAC,IAAI,EAAE,mBAAmB,KAAK,IAAI,GAAG,IAAI;IAIlD;;;OAGG;IACH,OAAO,IAAI,IAAI;CAGhB"}

package/out/service/utils/de-method-processer/de-method-processer.js

@@ -0,0 +1,75 @@
+import { QXEvent } from 'qx-util';
+/**
+ * @description 数据服务方法执行状态处理器
+ * @export
+ * @class DeMethodProcesser
+ */
+export class DeMethodProcesser {
+    /**
+     * Creates an instance of DeMethodProcesser.
+     * @param {string} srfSessionId
+     * @memberof DeMethodProcesser
+     */
+    constructor(srfSessionId) {
+        this.srfSessionId = srfSessionId;
+        /**
+         * @description 执行中方法数据
+         * @protected
+         * @type {Map<string, Method>} Map<执行标识，执行方法>
+         * @memberof DeMethodProcesser
+         */
+        this.data = new Map();
+        /**
+         * @description 事件对象
+         * @protected
+         * @memberof DeMethodProcesser
+         */
+        this.evt = new QXEvent();
+    }
+    /**
+     * @description 增加执行中方法
+     * @param {string} key
+     * @param {Method} method
+     * @memberof DeMethodProcesser
+     */
+    increment(key, method) {
+        this.data.set(key, method);
+        this.evt.emit('change', {
+            srfsessionid: this.srfSessionId,
+            type: 'BEFORE',
+        });
+    }
+    /**
+     * @description 减少执行中方法
+     * @param {string} key
+     * @memberof DeMethodProcesser
+     */
+    decrement(key) {
+        this.data.delete(key);
+        this.evt.emit('change', { srfsessionid: this.srfSessionId, type: 'AFTER' });
+    }
+    /**
+     * @description 订阅选中变更
+     * @param {(data: IMethodProcessState) => void} cb 执行回调
+     * @returns {*}  {void}
+     * @memberof DeMethodProcesser
+     */
+    on(cb) {
+        return this.evt.on('change', cb);
+    }
+    /**
+     * @description 取消选中订阅
+     * @param {(data: IMethodProcessState) => void} cb 一定要确定，传进来要取消订阅的方法和订阅时方法在内存中指向的是同一个
+     * @memberof DeMethodProcesser
+     */
+    off(cb) {
+        this.evt.off('change', cb);
+    }
+    /**
+     * @description 销毁
+     * @memberof DeMethodProcesser
+     */
+    destroy() {
+        this.evt.reset();
+    }
+}

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":"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"}
+{"version":3,"file":"dynamic-code-list.d.ts","sourceRoot":"","sources":["../../../../src/service/utils/dynamic-code-list/dynamic-code-list.ts"],"names":[],"mappings":"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"}

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

@@ -4,6 +4,7 @@ import { QXEvent, notNilEmpty } from 'qx-util';
 import { convertNavData, ScriptFactory } from '../../../utils';
 import { fieldValueToBoolean } from '../../utils';
 import { calcDeCodeNameById } from '../../../model';
+import { CodeListDataItem } from '../../vo';
 /**
  * 动态代码表缓存对象
  *
@@ -324,7 +325,10 @@ export class DynamicCodeListCache {
             }
             else {
                 res.data.forEach((item, index) => {
-                    resultItems.push(this.convertData(item, index, res.data));
+                    resultItems.push(new CodeListDataItem(this.codeList, item, {
+                        index,
+                        total: res.data.length,
+                    }));
                 });
             }
         }
@@ -340,7 +344,10 @@ export class DynamicCodeListCache {
         const map = {};
         const nestedList = [];
         items.forEach((data, index) => {
-            map[data[valueAppDEFieldId]] = this.convertData(data, index, items);
+            map[data[valueAppDEFieldId]] = new CodeListDataItem(this.codeList, data, {
+                index,
+                total: items.length,
+            });
         });
         items.forEach((data) => {
             const parent = map[data[pvalueAppDEFieldId]];

package/out/service/utils/index.d.ts

@@ -7,4 +7,5 @@ export { getMatchResPath, calcResPath } from './res-path/res-path';
 export { SearchFilter } from './search-filter/search-filter';
 export { fieldValueToBoolean } from './util/util';
 export { calcDynaSysParams } from './dyna-sys-params/dyna-sys-params';
+export { DeMethodProcesser } from './de-method-processer/de-method-processer';
 //# sourceMappingURL=index.d.ts.map

package/out/service/utils/index.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../src/service/utils/index.ts"],"names":[],"mappings":"AAAA,cAAc,cAAc,CAAC;AAC7B,cAAc,eAAe,CAAC;AAC9B,OAAO,EAAE,YAAY,EAAE,MAAM,mCAAmC,CAAC;AACjE,OAAO,EAAE,oBAAoB,EAAE,MAAM,uCAAuC,CAAC;AAC7E,OAAO,EAAE,OAAO,EAAE,MAAM,qBAAqB,CAAC;AAC9C,OAAO,EAAE,eAAe,EAAE,WAAW,EAAE,MAAM,qBAAqB,CAAC;AACnE,OAAO,EAAE,YAAY,EAAE,MAAM,+BAA+B,CAAC;AAC7D,OAAO,EAAE,mBAAmB,EAAE,MAAM,aAAa,CAAC;AAClD,OAAO,EAAE,iBAAiB,EAAE,MAAM,mCAAmC,CAAC"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../src/service/utils/index.ts"],"names":[],"mappings":"AAAA,cAAc,cAAc,CAAC;AAC7B,cAAc,eAAe,CAAC;AAC9B,OAAO,EAAE,YAAY,EAAE,MAAM,mCAAmC,CAAC;AACjE,OAAO,EAAE,oBAAoB,EAAE,MAAM,uCAAuC,CAAC;AAC7E,OAAO,EAAE,OAAO,EAAE,MAAM,qBAAqB,CAAC;AAC9C,OAAO,EAAE,eAAe,EAAE,WAAW,EAAE,MAAM,qBAAqB,CAAC;AACnE,OAAO,EAAE,YAAY,EAAE,MAAM,+BAA+B,CAAC;AAC7D,OAAO,EAAE,mBAAmB,EAAE,MAAM,aAAa,CAAC;AAClD,OAAO,EAAE,iBAAiB,EAAE,MAAM,mCAAmC,CAAC;AACtE,OAAO,EAAE,iBAAiB,EAAE,MAAM,2CAA2C,CAAC"}

package/out/service/utils/index.js

@@ -7,3 +7,4 @@ export { getMatchResPath, calcResPath } from './res-path/res-path';
 export { SearchFilter } from './search-filter/search-filter';
 export { fieldValueToBoolean } from './util/util';
 export { calcDynaSysParams } from './dyna-sys-params/dyna-sys-params';
+export { DeMethodProcesser } from './de-method-processer/de-method-processer';

package/out/service/vo/code-list-data-item/code-list-data-item.d.ts

@@ -0,0 +1,42 @@
+import { ISysImage, IAppCodeList } from '@ibiz/model-core';
+import { CodeListItem } from '../../../interface';
+export declare class CodeListDataItem implements CodeListItem {
+    id: string;
+    value: string | number;
+    text: string;
+    color?: string;
+    bkcolor?: string;
+    children?: CodeListItem[];
+    textCls?: string;
+    cls?: string;
+    disableSelect?: boolean;
+    sysImage?: ISysImage;
+    data?: IData;
+    tooltip?: string;
+    userData?: string;
+    beginValue?: number;
+    endValue?: number;
+    includeBeginValue?: boolean;
+    includeEndValue?: boolean;
+    /**
+     * @description 原始后台数据
+     * @type {IData}
+     * @memberof CodeListDataItem
+     */
+    $origin: IData;
+    /**
+     * Creates an instance of CodeListDataItem.
+     * @param {IAppCodeList} model
+     * @param {(ITreeNodeData | undefined)} data
+     * @param {{
+     *       index: number;
+     *       total: number;
+     *     }} opts
+     * @memberof CodeListDataItem
+     */
+    constructor(model: IAppCodeList, data: IData, opts: {
+        index: number;
+        total: number;
+    });
+}
+//# sourceMappingURL=code-list-data-item.d.ts.map

package/out/service/vo/code-list-data-item/code-list-data-item.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"code-list-data-item.d.ts","sourceRoot":"","sources":["../../../../src/service/vo/code-list-data-item/code-list-data-item.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,SAAS,EAAE,YAAY,EAAE,MAAM,kBAAkB,CAAC;AAC3D,OAAO,EAAE,YAAY,EAAE,MAAM,oBAAoB,CAAC;AAKlD,qBAAa,gBAAiB,YAAW,YAAY;IACnD,EAAE,EAAG,MAAM,CAAC;IAEZ,KAAK,EAAG,MAAM,GAAG,MAAM,CAAC;IAExB,IAAI,EAAG,MAAM,CAAC;IAEd,KAAK,CAAC,EAAE,MAAM,CAAC;IAEf,OAAO,CAAC,EAAE,MAAM,CAAC;IAEjB,QAAQ,CAAC,EAAE,YAAY,EAAE,CAAC;IAE1B,OAAO,CAAC,EAAE,MAAM,CAAC;IAEjB,GAAG,CAAC,EAAE,MAAM,CAAC;IAEb,aAAa,CAAC,EAAE,OAAO,CAAC;IAExB,QAAQ,CAAC,EAAE,SAAS,CAAC;IAErB,IAAI,CAAC,EAAE,KAAK,CAAC;IAEb,OAAO,CAAC,EAAE,MAAM,CAAC;IAEjB,QAAQ,CAAC,EAAE,MAAM,CAAC;IAElB,UAAU,CAAC,EAAE,MAAM,CAAC;IAEpB,QAAQ,CAAC,EAAE,MAAM,CAAC;IAElB,iBAAiB,CAAC,EAAE,OAAO,CAAC;IAE5B,eAAe,CAAC,EAAE,OAAO,CAAC;IAE1B;;;;OAIG;IACK,OAAO,EAAE,KAAK,CAAC;IAEvB;;;;;;;;;OASG;gBAED,KAAK,EAAE,YAAY,EACnB,IAAI,EAAE,KAAK,EACX,IAAI,EAAE;QACJ,KAAK,EAAE,MAAM,CAAC;QACd,KAAK,EAAE,MAAM,CAAC;KACf;CAkNJ"}

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

@@ -0,0 +1,185 @@
+/* eslint-disable @typescript-eslint/no-explicit-any */
+import { clone } from 'ramda';
+import { fieldValueToBoolean } from '../../utils';
+import { ScriptFactory } from '../../../utils';
+import { AppDataEntity } from '../..';
+export class CodeListDataItem {
+    /**
+     * Creates an instance of CodeListDataItem.
+     * @param {IAppCodeList} model
+     * @param {(ITreeNodeData | undefined)} data
+     * @param {{
+     *       index: number;
+     *       total: number;
+     *     }} opts
+     * @memberof CodeListDataItem
+     */
+    constructor(model, data, opts) {
+        Object.defineProperty(this, '$origin', {
+            enumerable: false,
+            configurable: true,
+            value: data,
+        });
+        const { appId, valueAppDEFieldId, textAppDEFieldId, iconClsAppDEFieldId, iconClsXAppDEFieldId, iconPathAppDEFieldId, iconPathXAppDEFieldId, disableAppDEFieldId, dataAppDEFieldId, clsAppDEFieldId, colorAppDEFieldId, thresholdGroup, beginValueAppDEFieldId, endValueAppDEFieldId, incBeginValueMode, incEndValueMode, bkcolorAppDEFieldId, } = model;
+        const { index, total } = opts;
+        // 标识属性
+        Object.defineProperty(this, 'id', {
+            get() {
+                return valueAppDEFieldId
+                    ? this.$origin[valueAppDEFieldId]
+                    : this.$origin.srfkey;
+            },
+            enumerable: true,
+            configurable: true,
+        });
+        // 值属性
+        Object.defineProperty(this, 'value', {
+            get() {
+                return valueAppDEFieldId
+                    ? this.$origin[valueAppDEFieldId]
+                    : this.$origin.srfkey;
+            },
+            enumerable: true,
+            configurable: true,
+        });
+        // 文本属性
+        Object.defineProperty(this, 'text', {
+            get() {
+                return textAppDEFieldId
+                    ? this.$origin[textAppDEFieldId]
+                    : this.$origin.srfmajortext;
+            },
+            enumerable: true,
+            configurable: true,
+        });
+        // 图标样式属性
+        Object.defineProperty(this, 'sysImage', {
+            get() {
+                if (iconClsAppDEFieldId ||
+                    iconClsXAppDEFieldId ||
+                    iconPathAppDEFieldId ||
+                    iconPathXAppDEFieldId) {
+                    const sysImage = { appId };
+                    if (iconClsAppDEFieldId)
+                        sysImage.cssClass = this.$origin[iconClsAppDEFieldId];
+                    if (iconClsXAppDEFieldId)
+                        sysImage.cssClassX = this.$origin[iconClsXAppDEFieldId];
+                    if (iconPathAppDEFieldId)
+                        sysImage.imagePath = this.$origin[iconPathAppDEFieldId];
+                    if (iconPathXAppDEFieldId)
+                        sysImage.imagePathX = this.$origin[iconPathXAppDEFieldId];
+                    return sysImage;
+                }
+                return undefined;
+            },
+            enumerable: true,
+            configurable: true,
+        });
+        // 禁止选择属性
+        Object.defineProperty(this, 'disableSelect', {
+            get() {
+                if (disableAppDEFieldId)
+                    return fieldValueToBoolean(this.$origin[disableAppDEFieldId]);
+                return undefined;
+            },
+            enumerable: true,
+            configurable: true,
+        });
+        // 样式表属性
+        Object.defineProperty(this, 'textCls', {
+            get() {
+                if (clsAppDEFieldId)
+                    return this.$origin[clsAppDEFieldId];
+                return undefined;
+            },
+            enumerable: true,
+            configurable: true,
+        });
+        // 颜色值属性
+        Object.defineProperty(this, 'color', {
+            get() {
+                if (colorAppDEFieldId)
+                    return this.$origin[colorAppDEFieldId];
+                return undefined;
+            },
+            enumerable: true,
+            configurable: true,
+        });
+        // 背景颜色属性
+        Object.defineProperty(this, 'bkcolor', {
+            get() {
+                if (bkcolorAppDEFieldId)
+                    return this.$origin[bkcolorAppDEFieldId];
+                return undefined;
+            },
+            enumerable: true,
+            configurable: true,
+        });
+        // 数据属性
+        if (dataAppDEFieldId && this.$origin[dataAppDEFieldId]) {
+            try {
+                this.data = ScriptFactory.execSingleLine(dataAppDEFieldId, this.$origin);
+            }
+            catch (error) {
+                ibiz.log.error(ibiz.i18n.t('runtime.service.dynamicCodeTable'));
+            }
+        }
+        // 阈值起始值
+        Object.defineProperty(this, 'beginValue', {
+            get() {
+                if (thresholdGroup && beginValueAppDEFieldId)
+                    return this.$origin[beginValueAppDEFieldId];
+                return undefined;
+            },
+            enumerable: true,
+            configurable: true,
+        });
+        // 阈值结束值
+        Object.defineProperty(this, 'endValue', {
+            get() {
+                if (thresholdGroup && endValueAppDEFieldId)
+                    return this.$origin[endValueAppDEFieldId];
+                return undefined;
+            },
+            enumerable: true,
+            configurable: true,
+        });
+        // 包含阈值起始值
+        Object.defineProperty(this, 'includeBeginValue', {
+            get() {
+                if (thresholdGroup && incBeginValueMode) {
+                    return (incBeginValueMode === 1 ||
+                        (incBeginValueMode === 2 && index === 0) ||
+                        (incBeginValueMode === 3 && index === total - 1));
+                }
+                return undefined;
+            },
+            enumerable: true,
+            configurable: true,
+        });
+        // 包含阈值结束值
+        Object.defineProperty(this, 'includeEndValue', {
+            get() {
+                if (thresholdGroup && incEndValueMode) {
+                    return (incEndValueMode === 1 ||
+                        (incEndValueMode === 2 && index === 0) ||
+                        (incEndValueMode === 3 && index === total - 1));
+                }
+                return undefined;
+            },
+            enumerable: true,
+            configurable: true,
+        });
+        // 关联其它属性，用于使用实体属性也要取到值的场景。
+        Object.keys(data instanceof AppDataEntity ? clone(data._data) : clone(data)).forEach(key => {
+            if (!Object.prototype.hasOwnProperty.call(this, key))
+                Object.defineProperty(this, key, {
+                    get() {
+                        return this.$origin[key];
+                    },
+                    enumerable: true,
+                    configurable: true,
+                });
+        });
+    }
+}

package/out/service/vo/code-list-data-item/index.d.ts

@@ -0,0 +1,2 @@
+export { CodeListDataItem } from './code-list-data-item';
+//# sourceMappingURL=index.d.ts.map

package/out/service/vo/code-list-data-item/index.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../../src/service/vo/code-list-data-item/index.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,gBAAgB,EAAE,MAAM,uBAAuB,CAAC"}

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

@@ -0,0 +1 @@
+export { CodeListDataItem } from './code-list-data-item';

package/out/service/vo/index.d.ts

@@ -6,4 +6,5 @@ export * from './map-data';
 export * from './panel-data';
 export * from './chart-data';
 export * from './gantt-node-data';
+export * from './code-list-data-item';
 //# sourceMappingURL=index.d.ts.map

package/out/service/vo/index.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../src/service/vo/index.ts"],"names":[],"mappings":"AAAA,cAAc,cAAc,CAAC;AAC7B,cAAc,kBAAkB,CAAC;AACjC,cAAc,gBAAgB,CAAC;AAC/B,cAAc,sBAAsB,CAAC;AACrC,cAAc,YAAY,CAAC;AAC3B,cAAc,cAAc,CAAC;AAC7B,cAAc,cAAc,CAAC;AAC7B,cAAc,mBAAmB,CAAC"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../src/service/vo/index.ts"],"names":[],"mappings":"AAAA,cAAc,cAAc,CAAC;AAC7B,cAAc,kBAAkB,CAAC;AACjC,cAAc,gBAAgB,CAAC;AAC/B,cAAc,sBAAsB,CAAC;AACrC,cAAc,YAAY,CAAC;AAC3B,cAAc,cAAc,CAAC;AAC7B,cAAc,cAAc,CAAC;AAC7B,cAAc,mBAAmB,CAAC;AAClC,cAAc,uBAAuB,CAAC"}