@ibiz-template/runtime 0.4.10 → 0.4.12

package/out/interface/controller/state/control/i-gantt.state.d.ts

@@ -1,13 +1,104 @@
 import { IMDControlState } from './i-md-control.state';
+import { ITreeNodeData } from './i-tree.state';
 /**
  * 甘特图状态
  *
- * @author zhanghengfeng
- * @date 2023-12-08 15:12:40
+ * @author tony001
+ * @date 2023-12-11 17:12:57
  * @export
  * @interface IGanttState
- * @extends {IMDControlState}
+ * @extends {ITreeState}
  */
 export interface IGanttState extends IMDControlState {
+    items: IGanttNodeData[];
+    /**
+     * 树的根节点
+     *
+     * @type {IGanttNodeData}
+     * @memberof IGanttState
+     */
+    rootNodes: IGanttNodeData[];
+    /**
+     * 查询条件
+     *
+     * @author tony001
+     * @date 2023-12-11 18:12:20
+     * @type {string}
+     */
+    query: string;
+    /**
+     * 快速搜索占位符
+     *
+     * @author tony001
+     * @date 2023-12-11 18:12:29
+     * @type {string}
+     */
+    placeHolder: string;
+}
+/**
+ * 甘特图节点数据格式
+ *
+ * @author tony001
+ * @date 2023-12-11 17:12:51
+ * @export
+ * @interface IGanttNodeData
+ */
+export interface IGanttNodeData extends ITreeNodeData {
+    /**
+     * 编号
+     *
+     * @author tony001
+     * @date 2023-12-11 17:12:39
+     * @type {string}
+     */
+    sndataIteValue: string;
+    /**
+     * 开始时间
+     *
+     * @author tony001
+     * @date 2023-12-11 17:12:12
+     * @type {string}
+     */
+    beginDataItemValue: string;
+    /**
+     * 结束时间
+     *
+     * @author tony001
+     * @date 2023-12-11 17:12:52
+     * @type {string}
+     */
+    endDataItemValue: string;
+    /**
+     * 前置数据
+     *
+     * @author tony001
+     * @date 2023-12-11 17:12:13
+     * @type {(string | number)}
+     */
+    prevDataItemValue: string | number;
+    /**
+     * 完成量数据
+     *
+     * @author tony001
+     * @date 2023-12-11 17:12:26
+     * @type {(string | number)}
+     */
+    finishDataItemValue: string | number;
+    /**
+     * 总量数据项
+     *
+     * @author tony001
+     * @date 2023-12-11 17:12:43
+     * @type {(string | number)}
+     */
+    totalDataItemValue: string | number;
+    /**
+     * 子数据
+     *
+     * @author tony001
+     * @date 2023-12-11 18:12:16
+     * @type {(IGanttNodeData[] | undefined)}
+     */
+    children?: IGanttNodeData[] | undefined;
 }
 //# sourceMappingURL=i-gantt.state.d.ts.map

package/out/interface/controller/state/control/i-gantt.state.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"i-gantt.state.d.ts","sourceRoot":"","sources":["../../../../../src/interface/controller/state/control/i-gantt.state.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,eAAe,EAAE,MAAM,sBAAsB,CAAC;AAEvD;;;;;;;;GAQG;AACH,MAAM,WAAW,WAAY,SAAQ,eAAe;CAAG"}
+{"version":3,"file":"i-gantt.state.d.ts","sourceRoot":"","sources":["../../../../../src/interface/controller/state/control/i-gantt.state.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,eAAe,EAAE,MAAM,sBAAsB,CAAC;AACvD,OAAO,EAAE,aAAa,EAAE,MAAM,gBAAgB,CAAC;AAE/C;;;;;;;;GAQG;AACH,MAAM,WAAW,WAAY,SAAQ,eAAe;IAClD,KAAK,EAAE,cAAc,EAAE,CAAC;IAExB;;;;;OAKG;IACH,SAAS,EAAE,cAAc,EAAE,CAAC;IAE5B;;;;;;OAMG;IACH,KAAK,EAAE,MAAM,CAAC;IAEd;;;;;;OAMG;IACH,WAAW,EAAE,MAAM,CAAC;CACrB;AAED;;;;;;;GAOG;AACH,MAAM,WAAW,cAAe,SAAQ,aAAa;IACnD;;;;;;OAMG;IACH,cAAc,EAAE,MAAM,CAAC;IAEvB;;;;;;OAMG;IACH,kBAAkB,EAAE,MAAM,CAAC;IAE3B;;;;;;OAMG;IACH,gBAAgB,EAAE,MAAM,CAAC;IAEzB;;;;;;OAMG;IACH,iBAAiB,EAAE,MAAM,GAAG,MAAM,CAAC;IAEnC;;;;;;OAMG;IACH,mBAAmB,EAAE,MAAM,GAAG,MAAM,CAAC;IAErC;;;;;;OAMG;IACH,kBAAkB,EAAE,MAAM,GAAG,MAAM,CAAC;IAEpC;;;;;;OAMG;IACH,QAAQ,CAAC,EAAE,cAAc,EAAE,GAAG,SAAS,CAAC;CACzC"}

package/out/interface/controller/state/view/i-de-index-view.state.d.ts

@@ -0,0 +1,19 @@
+import { IViewState } from './i-view.state';
+/**
+ * 实体首页视图UI状态
+ *
+ * @export
+ * @class IDEIndexViewState
+ * @extends {IViewState}
+ */
+export interface IDEIndexViewState extends IViewState {
+    /**
+     * 导航数据
+     *
+     * @author lxm
+     * @date 2023-12-11 06:23:55
+     * @type {string}
+     */
+    srfnav: string;
+}
+//# sourceMappingURL=i-de-index-view.state.d.ts.map

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

@@ -0,0 +1 @@
+{"version":3,"file":"i-de-index-view.state.d.ts","sourceRoot":"","sources":["../../../../../src/interface/controller/state/view/i-de-index-view.state.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,UAAU,EAAE,MAAM,gBAAgB,CAAC;AAE5C;;;;;;GAMG;AACH,MAAM,WAAW,iBAAkB,SAAQ,UAAU;IACnD;;;;;;OAMG;IACH,MAAM,EAAE,MAAM,CAAC;CAChB"}

package/out/interface/controller/state/view/i-de-index-view.state.js

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

package/out/interface/controller/state/view/i-edit-view2.state.d.ts

@@ -7,5 +7,13 @@ import { IEditViewState } from './i-edit-view.state';
  * @extends {IViewState}
  */
 export interface IEditView2State extends IEditViewState {
+    /**
+     * 导航数据
+     *
+     * @author lxm
+     * @date 2023-12-11 06:23:55
+     * @type {string}
+     */
+    srfnav: string;
 }
 //# sourceMappingURL=i-edit-view2.state.d.ts.map

package/out/interface/controller/state/view/i-edit-view2.state.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"i-edit-view2.state.d.ts","sourceRoot":"","sources":["../../../../../src/interface/controller/state/view/i-edit-view2.state.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,cAAc,EAAE,MAAM,qBAAqB,CAAC;AAErD;;;;;;GAMG;AACH,MAAM,WAAW,eAAgB,SAAQ,cAAc;CAAG"}
+{"version":3,"file":"i-edit-view2.state.d.ts","sourceRoot":"","sources":["../../../../../src/interface/controller/state/view/i-edit-view2.state.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,cAAc,EAAE,MAAM,qBAAqB,CAAC;AAErD;;;;;;GAMG;AACH,MAAM,WAAW,eAAgB,SAAQ,cAAc;IACrD;;;;;;OAMG;IACH,MAAM,EAAE,MAAM,CAAC;CAChB"}

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

@@ -8,6 +8,14 @@ import { IControllerState } from '../common/i-controller.state';
  * @class ViewState
  */
 export interface IViewState extends IControllerState, IViewSession {
+    /**
+     * 当前视图是否为激活状态(缓存下的激活状态，一般与框架的生命周期相同)
+     *
+     * @author chitanda
+     * @date 2023-12-13 11:12:20
+     * @type {boolean}
+     */
+    activated: boolean;
     /**
      * 视图标题
      *

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

@@ -1 +1 @@
-{"version":3,"file":"i-view.state.d.ts","sourceRoot":"","sources":["../../../../../src/interface/controller/state/view/i-view.state.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,YAAY,EAAE,MAAM,iBAAiB,CAAC;AAC/C,OAAO,EAAE,YAAY,EAAE,MAAM,cAAc,CAAC;AAC5C,OAAO,EAAE,gBAAgB,EAAE,MAAM,8BAA8B,CAAC;AAEhE;;;;;GAKG;AACH,MAAM,WAAW,UAAW,SAAQ,gBAAgB,EAAE,YAAY;IAChE;;;;;;OAMG;IACH,OAAO,EAAE,MAAM,CAAC;IAEhB;;;;;OAKG;IACH,SAAS,EAAE,OAAO,CAAC;IAEnB;;;;;OAKG;IACH,aAAa,EAAE,OAAO,CAAC;IAEvB;;;;;OAKG;IACH,OAAO,CAAC,EAAE,OAAO,CAAC;IAElB;;;;;OAKG;IACH,YAAY,EAAE;QAAE,CAAC,CAAC,EAAE,MAAM,GAAG,YAAY,EAAE,CAAA;KAAE,CAAC;CAC/C"}
+{"version":3,"file":"i-view.state.d.ts","sourceRoot":"","sources":["../../../../../src/interface/controller/state/view/i-view.state.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,YAAY,EAAE,MAAM,iBAAiB,CAAC;AAC/C,OAAO,EAAE,YAAY,EAAE,MAAM,cAAc,CAAC;AAC5C,OAAO,EAAE,gBAAgB,EAAE,MAAM,8BAA8B,CAAC;AAEhE;;;;;GAKG;AACH,MAAM,WAAW,UAAW,SAAQ,gBAAgB,EAAE,YAAY;IAChE;;;;;;OAMG;IACH,SAAS,EAAE,OAAO,CAAC;IAEnB;;;;;;OAMG;IACH,OAAO,EAAE,MAAM,CAAC;IAEhB;;;;;OAKG;IACH,SAAS,EAAE,OAAO,CAAC;IAEnB;;;;;OAKG;IACH,aAAa,EAAE,OAAO,CAAC;IAEvB;;;;;OAKG;IACH,OAAO,CAAC,EAAE,OAAO,CAAC;IAElB;;;;;OAKG;IACH,YAAY,EAAE;QAAE,CAAC,CAAC,EAAE,MAAM,GAAG,YAAY,EAAE,CAAA;KAAE,CAAC;CAC/C"}

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

@@ -45,4 +45,5 @@ export * from './i-chart-exp-view.state';
 export * from './i-map-view.state';
 export * from './i-report-view.state';
 export * from './i-gantt-view.state';
+export * from './i-de-index-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"}
+{"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"}

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

@@ -45,3 +45,4 @@ export * from './i-chart-exp-view.state';
 export * from './i-map-view.state';
 export * from './i-report-view.state';
 export * from './i-gantt-view.state';
+export * from './i-de-index-view.state';

package/out/interface/service/service/i-auth.service.d.ts

@@ -11,12 +11,13 @@ export interface IAuthService {
      * 登录
      *
      * @author chitanda
-     * @date 2023-08-17 16:08:23
+     * @date 2023-12-13 15:12:16
      * @param {string} loginName
      * @param {string} password
+     * @param {boolean} [remember]
      * @return {*}  {Promise<boolean>}
      */
-    login(loginName: string, password: string, rememberme?: boolean): Promise<boolean>;
+    login(loginName: string, password: string, remember?: boolean): Promise<boolean>;
     /**
      * 登出
      *

package/out/interface/service/service/i-auth.service.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"i-auth.service.d.ts","sourceRoot":"","sources":["../../../../src/interface/service/service/i-auth.service.ts"],"names":[],"mappings":"AAAA;;;;;;;GAOG;AACH,MAAM,WAAW,YAAY;IAC3B;;;;;;;;OAQG;IACH,KAAK,CACH,SAAS,EAAE,MAAM,EACjB,QAAQ,EAAE,MAAM,EAChB,UAAU,CAAC,EAAE,OAAO,GACnB,OAAO,CAAC,OAAO,CAAC,CAAC;IAEpB;;;;;;OAMG;IACH,MAAM,IAAI,OAAO,CAAC,OAAO,CAAC,CAAC;IAE3B;;;;;;OAMG;IACH,WAAW,IAAI,OAAO,CAAC,IAAI,CAAC,CAAC;CAC9B"}
+{"version":3,"file":"i-auth.service.d.ts","sourceRoot":"","sources":["../../../../src/interface/service/service/i-auth.service.ts"],"names":[],"mappings":"AAAA;;;;;;;GAOG;AACH,MAAM,WAAW,YAAY;IAC3B;;;;;;;;;OASG;IACH,KAAK,CACH,SAAS,EAAE,MAAM,EACjB,QAAQ,EAAE,MAAM,EAChB,QAAQ,CAAC,EAAE,OAAO,GACjB,OAAO,CAAC,OAAO,CAAC,CAAC;IAEpB;;;;;;OAMG;IACH,MAAM,IAAI,OAAO,CAAC,OAAO,CAAC,CAAC;IAE3B;;;;;;OAMG;IACH,WAAW,IAAI,OAAO,CAAC,IAAI,CAAC,CAAC;CAC9B"}

package/out/register/helper/ui-action-register.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"ui-action-register.d.ts","sourceRoot":"","sources":["../../../src/register/helper/ui-action-register.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,YAAY,EAAE,MAAM,kBAAkB,CAAC;AAChD,OAAO,EAAE,iBAAiB,EAAE,MAAM,iBAAiB,CAAC;AAGpD,gBAAgB;AAChB,eAAO,MAAM,wBAAwB,aAAa,CAAC;AAEnD;;;;;;;GAOG;AACH,wBAAgB,wBAAwB,CACtC,GAAG,EAAE,MAAM,EACX,QAAQ,EAAE,MAAM,iBAAiB,GAChC,IAAI,CAEN;AAQD;;;;;;;GAOG;AACH,wBAAsB,mBAAmB,CACvC,KAAK,EAAE,YAAY,GAClB,OAAO,CAAC,iBAAiB,CAAC,CAyB5B"}
+{"version":3,"file":"ui-action-register.d.ts","sourceRoot":"","sources":["../../../src/register/helper/ui-action-register.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,YAAY,EAAE,MAAM,kBAAkB,CAAC;AAChD,OAAO,EAAE,iBAAiB,EAAE,MAAM,iBAAiB,CAAC;AAGpD,gBAAgB;AAChB,eAAO,MAAM,wBAAwB,aAAa,CAAC;AAEnD;;;;;;;GAOG;AACH,wBAAgB,wBAAwB,CACtC,GAAG,EAAE,MAAM,EACX,QAAQ,EAAE,MAAM,iBAAiB,GAChC,IAAI,CAEN;AAQD;;;;;;;GAOG;AACH,wBAAsB,mBAAmB,CACvC,KAAK,EAAE,YAAY,GAClB,OAAO,CAAC,iBAAiB,CAAC,CA+B5B"}

package/out/register/helper/ui-action-register.js

@@ -26,7 +26,7 @@ function getProvider(key) {
  */
 export async function getUIActionProvider(model) {
     let provider;
-    const { uiactionMode, sysPFPluginId, appId } = model;
+    const { uiactionMode, sysPFPluginId, appId, uiactionTag } = model;
     // 找插件适配器
     if (sysPFPluginId) {
         const pluginKey = await getPluginRegisterKey(sysPFPluginId, appId);
@@ -40,6 +40,11 @@ export async function getUIActionProvider(model) {
             return provider;
         }
     }
+    // 先通过uiactionTag找界面行为适配器
+    provider = getProvider(`${uiactionMode}_${uiactionTag}`);
+    if (provider) {
+        return provider;
+    }
     // 找界面行为类型
     provider = getProvider(uiactionMode);
     if (!provider) {

package/out/service/service/auth/v7-auth.service.d.ts

@@ -8,7 +8,7 @@ import { IAuthService } from '../../../interface';
  * @class AuthService
  */
 export declare class V7AuthService implements IAuthService {
-    login(loginname: string, password: string, rememberme?: boolean): Promise<boolean>;
+    login(loginName: string, password: string, remember?: boolean): Promise<boolean>;
     logout(): Promise<boolean>;
     extendLogin(): Promise<void>;
 }

package/out/service/service/auth/v7-auth.service.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"v7-auth.service.d.ts","sourceRoot":"","sources":["../../../../src/service/service/auth/v7-auth.service.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,YAAY,EAAE,MAAM,oBAAoB,CAAC;AAElD;;;;;;;GAOG;AACH,qBAAa,aAAc,YAAW,YAAY;IAC1C,KAAK,CACT,SAAS,EAAE,MAAM,EACjB,QAAQ,EAAE,MAAM,EAChB,UAAU,CAAC,EAAE,OAAO,GACnB,OAAO,CAAC,OAAO,CAAC;IA8Bb,MAAM,IAAI,OAAO,CAAC,OAAO,CAAC;IAe1B,WAAW,IAAI,OAAO,CAAC,IAAI,CAAC;CAqBnC"}
+{"version":3,"file":"v7-auth.service.d.ts","sourceRoot":"","sources":["../../../../src/service/service/auth/v7-auth.service.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,YAAY,EAAE,MAAM,oBAAoB,CAAC;AAElD;;;;;;;GAOG;AACH,qBAAa,aAAc,YAAW,YAAY;IAC1C,KAAK,CACT,SAAS,EAAE,MAAM,EACjB,QAAQ,EAAE,MAAM,EAChB,QAAQ,CAAC,EAAE,OAAO,GACjB,OAAO,CAAC,OAAO,CAAC;IAiCb,MAAM,IAAI,OAAO,CAAC,OAAO,CAAC;IAgB1B,WAAW,IAAI,OAAO,CAAC,IAAI,CAAC;CA2BnC"}

package/out/service/service/auth/v7-auth.service.js

@@ -9,19 +9,22 @@ import { clearCookie, getCookie, setCookie } from 'qx-util';
  * @class AuthService
  */
 export class V7AuthService {
-    async login(loginname, password, rememberme) {
+    async login(loginName, password, remember) {
         // eslint-disable-next-line no-useless-catch
         try {
             const res = await ibiz.net.post('/v7/login', {
-                loginname,
+                loginname: loginName,
                 password,
-                rememberme,
+                rememberme: remember,
             });
             const { data } = res;
             if (data && data.token) {
-                setCookie(CoreConst.TOKEN, data.token, rememberme ? 7 : 0, true);
+                if (remember) {
+                    setCookie(CoreConst.TOKEN_REMEMBER, '1', 7, true);
+                }
+                setCookie(CoreConst.TOKEN, data.token, remember ? 7 : 0, true);
                 const expiredDate = new Date().getTime() + (data.expirein || 7199) * 1000;
-                setCookie(CoreConst.TOKEN_EXPIRES, `${expiredDate}`, rememberme ? 7 : 0, true);
+                setCookie(CoreConst.TOKEN_EXPIRES, `${expiredDate}`, remember ? 7 : 0, true);
             }
             return true;
         }
@@ -38,6 +41,7 @@ export class V7AuthService {
             await ibiz.net.get('/v7/logout');
             clearCookie(CoreConst.TOKEN);
             clearCookie(CoreConst.TOKEN_EXPIRES);
+            clearCookie(CoreConst.TOKEN_REMEMBER);
             return true;
         }
         catch (err) {
@@ -51,6 +55,7 @@ export class V7AuthService {
     async extendLogin() {
         const token = getCookie(CoreConst.TOKEN);
         const expirein = getCookie(CoreConst.TOKEN_EXPIRES);
+        const remember = getCookie(CoreConst.TOKEN_REMEMBER);
         if (token && expirein) {
             // 计算到过期时间所需的延时毫秒数，预留提前量
             let wait = Number(expirein) - new Date().getTime();
@@ -59,9 +64,9 @@ export class V7AuthService {
             setTimeout(async () => {
                 const res = await ibiz.net.get(`/uaa/refreshtoken2`);
                 if (res.ok) {
-                    setCookie(CoreConst.TOKEN, res.data.token, 0, true);
+                    setCookie(CoreConst.TOKEN, res.data.token, remember ? 7 : 0, true);
                     const expiredDate = new Date().getTime() + (res.data.expirein || 7199) * 1000;
-                    setCookie(CoreConst.TOKEN_EXPIRES, `${expiredDate}`, 0, true);
+                    setCookie(CoreConst.TOKEN_EXPIRES, `${expiredDate}`, remember ? 7 : 0, true);
                 }
                 // 下一次延时做准备
                 this.extendLogin();

package/out/service/service/entity/de.service.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"de.service.d.ts","sourceRoot":"","sources":["../../../../src/service/service/entity/de.service.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"de.service.d.ts","sourceRoot":"","sources":["../../../../src/service/service/entity/de.service.ts"],"names":[],"mappings":"AAAA,OAAO,EAAgB,cAAc,EAAE,MAAM,kBAAkB,CAAC;AAChE,OAAO,EACL,aAAa,EACb,kBAAkB,EAGnB,MAAM,qBAAqB,CAAC;AAC7B,OAAO,EAAE,OAAO,EAAe,MAAM,aAAa,CAAC;AACnD,OAAO,EAAE,eAAe,EAAE,MAAM,gCAAgC,CAAC;AACjE,OAAO,EAAE,MAAM,EAAE,MAAM,iBAAiB,CAAC;AACzC,OAAO,EAAE,WAAW,EAAE,MAAM,sBAAsB,CAAC;AAEnD,OAAO,EAAE,aAAa,EAAE,MAAM,oBAAoB,CAAC;AACnD,OAAO,EAAE,aAAa,EAAE,MAAM,0BAA0B,CAAC;AAGzD;;;;;;;GAOG;AACH,qBAAa,SAAU,YAAW,aAAa;IAsDjC,SAAS,CAAC,KAAK,EAAE,cAAc;IArD3C;;;;;;OAMG;IACH,QAAQ,CAAC,WAAW,EAAE,aAAa,CAAC;IAEpC;;;;;;OAMG;IACH,QAAQ,CAAC,EAAE,EAAE,eAAe,CAAC;IAE7B;;;;;;OAMG;IACH,QAAQ,CAAC,IAAI,EAAE,WAAW,CAAC;IAE3B;;;;;;;OAOG;IACH,SAAS,CAAC,QAAQ,CAAC,SAAS,EAAE,GAAG,CAAC,MAAM,EAAE,MAAM,CAAC,CAAa;IAE9D;;;;;;OAMG;IACH,QAAQ,CAAC,KAAK,EAAE,OAAO,CAAC;IAExB;;;;;;OAMG;gBACmB,KAAK,EAAE,cAAc;IAW3C;;;;;;;;;OASG;cACa,SAAS,CACvB,EAAE,EAAE,MAAM,EACV,MAAM,GAAE,OAAe,GACtB,OAAO,CAAC,MAAM,CAAC;IAiBlB;;;;;;;;;;OAUG;IACG,IAAI,CACR,EAAE,EAAE,MAAM,EACV,OAAO,EAAE,OAAO,EAChB,MAAM,CAAC,EAAE,KAAK,GAAG,KAAK,EAAE,EACxB,OAAO,CAAC,EAAE,OAAO,GAChB,OAAO,CAAC,aAAa,CAAC;IAQzB,QAAQ,CACN,OAAO,EAAE,OAAO,EAChB,MAAM,CAAC,EAAE,KAAK,GAAG,KAAK,EAAE,EACxB,OAAO,CAAC,EAAE,OAAO,GAChB,OAAO,CAAC,aAAa,CAAC,KAAK,CAAC,CAAC;IAIhC,MAAM,CACJ,OAAO,EAAE,OAAO,EAChB,MAAM,CAAC,EAAE,KAAK,GAAG,KAAK,EAAE,EACxB,OAAO,CAAC,EAAE,OAAO,GAChB,OAAO,CAAC,aAAa,CAAC,KAAK,CAAC,CAAC;IAIhC,GAAG,CACD,OAAO,EAAE,OAAO,EAChB,MAAM,CAAC,EAAE,KAAK,GAAG,KAAK,EAAE,EACxB,OAAO,CAAC,EAAE,OAAO,GAChB,OAAO,CAAC,aAAa,CAAC,KAAK,CAAC,CAAC;IAIhC,MAAM,CACJ,OAAO,EAAE,OAAO,EAChB,MAAM,CAAC,EAAE,KAAK,GAAG,KAAK,EAAE,EACxB,OAAO,CAAC,EAAE,OAAO,GAChB,OAAO,CAAC,aAAa,CAAC,KAAK,CAAC,CAAC;IAIhC,MAAM,CACJ,OAAO,EAAE,OAAO,EAChB,MAAM,CAAC,EAAE,KAAK,GAAG,KAAK,EAAE,EACxB,OAAO,CAAC,EAAE,OAAO,GAChB,OAAO,CAAC,aAAa,CAAC,KAAK,CAAC,CAAC;IAIhC,YAAY,CACV,OAAO,EAAE,OAAO,EAChB,MAAM,CAAC,EAAE,KAAK,GAAG,KAAK,EAAE,EACxB,OAAO,CAAC,EAAE,OAAO,GAChB,OAAO,CAAC,aAAa,CAAC,KAAK,CAAC,CAAC;IAIhC,YAAY,CACV,OAAO,EAAE,OAAO,EAChB,MAAM,CAAC,EAAE,KAAK,GAAG,KAAK,EAAE,EACxB,OAAO,CAAC,EAAE,OAAO,GAChB,OAAO,CAAC,aAAa,CAAC,KAAK,CAAC,CAAC;IAIhC,UAAU,CACR,OAAO,EAAE,OAAO,EAChB,MAAM,CAAC,EAAE,KAAK,GAAG,KAAK,EAAE,EACxB,OAAO,CAAC,EAAE,OAAO,GAChB,OAAO,CAAC,aAAa,CAAC,KAAK,CAAC,CAAC;IAIhC,OAAO,CACL,OAAO,EAAE,OAAO,EAChB,MAAM,CAAC,EAAE,KAAK,GAAG,KAAK,EAAE,EACxB,OAAO,CAAC,EAAE,OAAO,GAChB,OAAO,CAAC,aAAa,CAAC,KAAK,CAAC,CAAC;IAIhC,UAAU,CACR,OAAO,EAAE,OAAO,EAChB,MAAM,CAAC,EAAE,KAAK,GAAG,KAAK,EAAE,EACxB,OAAO,CAAC,EAAE,OAAO,GAChB,OAAO,CAAC,aAAa,CAAC,KAAK,CAAC,CAAC;IAIhC,UAAU,CACR,OAAO,EAAE,OAAO,EAChB,MAAM,CAAC,EAAE,KAAK,GAAG,KAAK,EAAE,EACxB,OAAO,CAAC,EAAE,OAAO,GAChB,OAAO,CAAC,aAAa,CAAC,KAAK,CAAC,CAAC;IAIhC,gBAAgB,CACd,OAAO,EAAE,OAAO,EAChB,MAAM,CAAC,EAAE,KAAK,GAAG,KAAK,EAAE,EACxB,OAAO,CAAC,EAAE,OAAO,GAChB,OAAO,CAAC,aAAa,CAAC,KAAK,CAAC,CAAC;IAIhC;;;;;;;;;;OAUG;IACG,MAAM,CACV,EAAE,EAAE,MAAM,EACV,OAAO,EAAE,OAAO,EAChB,MAAM,CAAC,EAAE,KAAK,GAAG,KAAK,EAAE,EACxB,OAAO,GAAE,OAAY,GACpB,OAAO,CAAC,aAAa,CAAC;IAQzB;;;;;;;;;;OAUG;IACH,SAAS,CACP,SAAS,EAAE,CAAC,IAAI,EAAE,kBAAkB,KAAK,IAAI,EAC7C,OAAO,EAAE,OAAO,EAChB,MAAM,GAAE,OAAY,EACpB,IAAI,GAAE,KAAU,GACf,OAAO,CAAC,IAAI,CAAC;IA6BhB;;;;;;;;;OASG;IACH,aAAa,CACX,OAAO,EAAE,OAAO,EAChB,MAAM,GAAE,OAAY,EACpB,IAAI,GAAE,KAAU,GACf,OAAO,CAAC,aAAa,CAAC;IAMzB;;;;;;;;;OASG;IACH,SAAS,CAAC,WAAW,CACnB,OAAO,EAAE,OAAO,EAChB,WAAW,GAAE,OAAe,GAC3B,MAAM;CAQV"}

package/out/service/service/entity/de.service.js

@@ -32,14 +32,7 @@ export class DEService {
          * @type {Map<string, Method>}
          */
         this.methodMap = new Map();
-        /**
-         * 数据缓存
-         *
-         * @author chitanda
-         * @date 2022-08-18 19:08:40
-         * @type {DECache}
-         */
-        this.local = new DECache();
+        this.local = new DECache(model);
         this.configCache = new ConfigService(model.appId, 'PSAppDataEntity', model.codeName);
         this.wf = new WorkFlowService(model);
         this.file = new FileService(model);

package/out/service/service/entity/method/de-action.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"de-action.d.ts","sourceRoot":"","sources":["../../../../../src/service/service/entity/method/de-action.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,YAAY,EACZ,aAAa,EAGd,MAAM,qBAAqB,CAAC;AAC7B,OAAO,EAAE,YAAY,EAAE,MAAM,kBAAkB,CAAC;AAEhD,OAAO,EAAE,MAAM,EAAE,MAAM,UAAU,CAAC;AAClC,OAAO,EAAE,WAAW,EAAE,MAAM,uBAAuB,CAAC;AAKpD;;;;;;;;GAQG;AACH,qBAAa,cAAe,SAAQ,MAAM;IAChC,MAAM,EAAE,YAAY,CAAC;IAE7B;;;;;;;;OAQG;IACH,SAAS,KAAK,WAAW,IAAI,OAAO,CAEnC;IAED;;;;;;;OAOG;IACG,WAAW,CACf,OAAO,EAAE,OAAO,EAChB,IAAI,EAAE,KAAK,GAAG,KAAK,EAAE,GACpB,OAAO,CAAC,KAAK,GAAG,KAAK,EAAE,CAAC;IAQrB,IAAI,CACR,OAAO,EAAE,OAAO,EAChB,IAAI,CAAC,EAAE,KAAK,GAAG,KAAK,EAAE,EACtB,MAAM,CAAC,EAAE,OAAO,GACf,OAAO,CAAC,YAAY,CAAC,KAAK,CAAC,CAAC;IAsF/B;;;;;;;;OAQG;IACG,MAAM,CACV,OAAO,EAAE,OAAO,EAChB,IAAI,CAAC,EAAE,KAAK,GAAG,KAAK,EAAE,EACtB,MAAM,CAAC,EAAE,OAAO,GACf,OAAO,CAAC,aAAa,CAAC,WAAW,CAAC,CAAC;IAatC;;;;;;;;OAQG;IACG,MAAM,CACV,OAAO,EAAE,OAAO,EAChB,MAAM,CAAC,EAAE,OAAO,GACf,OAAO,CAAC,aAAa,CAAC,WAAW,CAAC,CAAC;IAYtC;;;;;;;;;OASG;IACG,MAAM,CACV,OAAO,EAAE,OAAO,EAChB,IAAI,CAAC,EAAE,KAAK,GAAG,KAAK,EAAE,EACtB,MAAM,CAAC,EAAE,OAAO,GACf,OAAO,CAAC,aAAa,CAAC,WAAW,CAAC,CAAC;IAiBtC;;;;;;;;OAQG;IACG,GAAG,CACP,OAAO,EAAE,OAAO,EAChB,MAAM,GAAE,OAAY,GACnB,OAAO,CAAC,aAAa,CAAC,WAAW,CAAC,CAAC;IAatC;;;;;;;;OAQG;IACG,QAAQ,CACZ,OAAO,EAAE,OAAO,EAChB,MAAM,CAAC,EAAE,OAAO,GACf,OAAO,CAAC,aAAa,CAAC,KAAK,CAAC,CAAC;IAUhC;;;;;;;;OAQG;IACG,UAAU,CACd,OAAO,EAAE,OAAO,EAChB,MAAM,EAAE,KAAK,GAAG,KAAK,EAAE,GACtB,OAAO,CAAC,aAAa,CAAC,WAAW,CAAC,CAAC;IAkBtC;;;;;;;;OAQG;IACG,YAAY,CAChB,QAAQ,EAAE,OAAO,EACjB,OAAO,CAAC,EAAE,OAAO,GAChB,OAAO,CAAC,aAAa,CAAC,WAAW,CAAC,CAAC;IAatC;;;;;;;;OAQG;IACG,UAAU,CACd,OAAO,EAAE,OAAO,EAChB,MAAM,CAAC,EAAE,OAAO,GACf,OAAO,CAAC,aAAa,CAAC,WAAW,CAAC,CAAC;IAoBtC;;;;;;;;OAQG;IACG,UAAU,CACd,OAAO,EAAE,OAAO,EAChB,MAAM,EAAE,KAAK,GAAG,KAAK,EAAE,GACtB,OAAO,CAAC,aAAa,CAAC,WAAW,CAAC,CAAC;IAqBtC;;;;;;;;OAQG;IACG,OAAO,CACX,OAAO,EAAE,OAAO,EAChB,MAAM,CAAC,EAAE,OAAO,GACf,OAAO,CAAC,aAAa,CAAC,WAAW,CAAC,CAAC;IAqBtC;;;;;;OAMG;IACG,eAAe,CACnB,QAAQ,EAAE,OAAO,EACjB,OAAO,CAAC,EAAE,OAAO,GAChB,OAAO,CAAC,aAAa,CAAC;CAc1B"}
+{"version":3,"file":"de-action.d.ts","sourceRoot":"","sources":["../../../../../src/service/service/entity/method/de-action.ts"],"names":[],"mappings":"AAAA,OAAO,EAEL,YAAY,EACZ,aAAa,EAGd,MAAM,qBAAqB,CAAC;AAC7B,OAAO,EAAE,YAAY,EAAE,MAAM,kBAAkB,CAAC;AAEhD,OAAO,EAAE,MAAM,EAAE,MAAM,UAAU,CAAC;AAClC,OAAO,EAAE,WAAW,EAAE,MAAM,uBAAuB,CAAC;AAKpD;;;;;;;;GAQG;AACH,qBAAa,cAAe,SAAQ,MAAM;IAChC,MAAM,EAAE,YAAY,CAAC;IAE7B;;;;;;;;OAQG;IACH,SAAS,KAAK,WAAW,IAAI,OAAO,CAEnC;IAED;;;;;;;OAOG;IACG,WAAW,CACf,OAAO,EAAE,OAAO,EAChB,IAAI,EAAE,KAAK,GAAG,KAAK,EAAE,GACpB,OAAO,CAAC,KAAK,GAAG,KAAK,EAAE,CAAC;IAQrB,IAAI,CACR,OAAO,EAAE,OAAO,EAChB,IAAI,CAAC,EAAE,KAAK,GAAG,KAAK,EAAE,EACtB,MAAM,CAAC,EAAE,OAAO,GACf,OAAO,CAAC,YAAY,CAAC,KAAK,CAAC,CAAC;IAsF/B;;;;;;;;OAQG;IACG,MAAM,CACV,OAAO,EAAE,OAAO,EAChB,IAAI,CAAC,EAAE,KAAK,GAAG,KAAK,EAAE,EACtB,MAAM,CAAC,EAAE,OAAO,GACf,OAAO,CAAC,aAAa,CAAC,WAAW,CAAC,CAAC;IAatC;;;;;;;;OAQG;IACG,MAAM,CACV,OAAO,EAAE,OAAO,EAChB,MAAM,CAAC,EAAE,OAAO,GACf,OAAO,CAAC,aAAa,CAAC,WAAW,CAAC,CAAC;IAYtC;;;;;;;;;OASG;IACG,MAAM,CACV,OAAO,EAAE,OAAO,EAChB,IAAI,CAAC,EAAE,KAAK,GAAG,KAAK,EAAE,EACtB,MAAM,CAAC,EAAE,OAAO,GACf,OAAO,CAAC,aAAa,CAAC,WAAW,CAAC,CAAC;IAiBtC;;;;;;;;OAQG;IACG,GAAG,CACP,OAAO,EAAE,OAAO,EAChB,MAAM,GAAE,OAAY,GACnB,OAAO,CAAC,aAAa,CAAC,WAAW,CAAC,CAAC;IAatC;;;;;;;;OAQG;IACG,QAAQ,CACZ,OAAO,EAAE,OAAO,EAChB,MAAM,CAAC,EAAE,OAAO,GACf,OAAO,CAAC,aAAa,CAAC,KAAK,CAAC,CAAC;IAUhC;;;;;;;;OAQG;IACG,UAAU,CACd,OAAO,EAAE,OAAO,EAChB,MAAM,EAAE,KAAK,GAAG,KAAK,EAAE,GACtB,OAAO,CAAC,aAAa,CAAC,WAAW,CAAC,CAAC;IAkBtC;;;;;;;;OAQG;IACG,YAAY,CAChB,QAAQ,EAAE,OAAO,EACjB,OAAO,CAAC,EAAE,OAAO,GAChB,OAAO,CAAC,aAAa,CAAC,WAAW,CAAC,CAAC;IAatC;;;;;;;;OAQG;IACG,UAAU,CACd,OAAO,EAAE,OAAO,EAChB,MAAM,CAAC,EAAE,OAAO,GACf,OAAO,CAAC,aAAa,CAAC,WAAW,CAAC,CAAC;IAoBtC;;;;;;;;OAQG;IACG,UAAU,CACd,OAAO,EAAE,OAAO,EAChB,MAAM,EAAE,KAAK,GAAG,KAAK,EAAE,GACtB,OAAO,CAAC,aAAa,CAAC,WAAW,CAAC,CAAC;IAqBtC;;;;;;;;OAQG;IACG,OAAO,CACX,OAAO,EAAE,OAAO,EAChB,MAAM,CAAC,EAAE,OAAO,GACf,OAAO,CAAC,aAAa,CAAC,WAAW,CAAC,CAAC;IAqBtC;;;;;;OAMG;IACG,eAAe,CACnB,QAAQ,EAAE,OAAO,EACjB,OAAO,CAAC,EAAE,OAAO,GAChB,OAAO,CAAC,aAAa,CAAC;CAc1B"}

package/out/service/service/entity/method/de-action.js

@@ -1,4 +1,4 @@
-import { HttpResponse, RuntimeError, RuntimeModelError, } from '@ibiz-template/core';
+import { HttpError, HttpResponse, RuntimeError, RuntimeModelError, } from '@ibiz-template/core';
 import { isArray, isNil } from 'lodash-es';
 import { Method } from './method';
 import { findDELogic } from '../../../../model';
@@ -233,7 +233,7 @@ export class DEActionMethod extends Method {
             return new HttpResponse(resultData);
         }
         catch (err) {
-            return new HttpResponse(err, 500);
+            throw new HttpError(err);
         }
     }
     /**
@@ -284,7 +284,7 @@ export class DEActionMethod extends Method {
             return new HttpResponse(data, 500);
         }
         catch (err) {
-            return new HttpResponse(err, 500);
+            throw new HttpError(err);
         }
     }
     /**
@@ -313,7 +313,7 @@ export class DEActionMethod extends Method {
             return new HttpResponse(resultData, 500);
         }
         catch (err) {
-            return new HttpResponse(err, 500);
+            throw new HttpError(err);
         }
     }
     /**
@@ -343,7 +343,7 @@ export class DEActionMethod extends Method {
             return new HttpResponse(data, 500);
         }
         catch (err) {
-            return new HttpResponse(err, 500);
+            throw new HttpError(err);
         }
     }
     /**

package/out/service/utils/de-cache/de-cache.d.ts

@@ -1,3 +1,4 @@
+import { IAppDataEntity } from '@ibiz/model-core';
 import { IDataEntity } from '../../../interface';
 /**
  * 实体缓存工具类
@@ -8,6 +9,17 @@ import { IDataEntity } from '../../../interface';
  * @class DECache
  */
 export declare class DECache {
+    protected entity: IAppDataEntity;
+    /**
+     * 是否是联合主键
+     * @author lxm
+     * @date 2023-12-12 02:47:18
+     * @readonly
+     * @protected
+     * @type {boolean}
+     */
+    protected get isUnionKey(): boolean;
+    constructor(entity: IAppDataEntity);
     /**
      * 数据缓存
      *
@@ -155,5 +167,12 @@ export declare class DECache {
      * @return {*}  {Map<string, IDataEntity>}
      */
     private getCacheByTag;
+    /**
+     * 根据联合键值计算主键并赋值
+     * @author lxm
+     * @date 2023-12-12 03:06:30
+     * @param {(IDataEntity | IDataEntity[])} data 需要计算的数据或数据集合
+     */
+    protected calcUnionKey(data: IDataEntity): void;
 }
 //# sourceMappingURL=de-cache.d.ts.map

package/out/service/utils/de-cache/de-cache.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"de-cache.d.ts","sourceRoot":"","sources":["../../../../src/service/utils/de-cache/de-cache.ts"],"names":[],"mappings":"AAMA,OAAO,EAAE,WAAW,EAAE,MAAM,oBAAoB,CAAC;AAEjD;;;;;;;GAOG;AACH,qBAAa,OAAO;IAClB;;;;;;OAMG;IACH,QAAQ,CAAC,QAAQ,EAAE,GAAG,CAAC,MAAM,EAAE,GAAG,CAAC,MAAM,EAAE,WAAW,CAAC,CAAC,CAAa;IAErE;;;;;;;OAOG;IACH,QAAQ,CAAC,OAAO,EAAE,OAAO,EAAE,MAAM,EAAE,WAAW,GAAG,IAAI;IASrD;;;;;;;OAOG;IACH,WAAW,CAAC,OAAO,EAAE,OAAO,EAAE,MAAM,EAAE,WAAW,GAAG,IAAI;IAMxD;;;;;;;OAOG;IACH,WAAW,CAAC,OAAO,EAAE,OAAO,EAAE,MAAM,EAAE,MAAM,GAAG,IAAI;IAMnD;;;;;;;OAOG;IACH,GAAG,CAAC,OAAO,EAAE,OAAO,EAAE,MAAM,EAAE,WAAW,GAAG,WAAW,GAAG,IAAI;IAiB9D;;;;;;;OAOG;IACH,GAAG,CAAC,OAAO,EAAE,OAAO,EAAE,MAAM,EAAE,MAAM,GAAG,WAAW,GAAG,IAAI;IAazD;;;;;;;OAOG;IACH,MAAM,CAAC,OAAO,EAAE,OAAO,EAAE,MAAM,EAAE,WAAW,GAAG,WAAW,GAAG,IAAI;IAoBjE;;;;;;;OAOG;IACH,MAAM,CAAC,OAAO,EAAE,OAAO,EAAE,MAAM,EAAE,MAAM,GAAG,WAAW,GAAG,IAAI;IAmB5D;;;;;;;;OAQG;IACH,WAAW,CAAC,OAAO,EAAE,OAAO,EAAE,QAAQ,EAAE,WAAW,EAAE,GAAG,WAAW,EAAE;IAsBrE;;;;;;;;OAQG;IACH,WAAW,CAAC,OAAO,EAAE,OAAO,EAAE,QAAQ,EAAE,WAAW,EAAE,GAAG,WAAW,EAAE;IA2BrE;;;;;;;;OAQG;IACH,WAAW,CAAC,OAAO,EAAE,OAAO,EAAE,OAAO,EAAE,MAAM,EAAE,GAAG,MAAM,EAAE;IA4B1D;;;;;;;;OAQG;IACH,SAAS,CAAC,OAAO,EAAE,OAAO,EAAE,MAAM,EAAE,MAAM,GAAG,OAAO;IAMpD;;;;;;;OAOG;IACH,OAAO,CAAC,OAAO,EAAE,OAAO,GAAG,WAAW,EAAE;IAexC;;;;;;;OAOG;IACH,YAAY,CAAC,MAAM,GAAE,OAAY,GAAG,CAAC,CAAC,EAAE,OAAO,EAAE,CAAC,KAAK,OAAO;IAgB9D;;;;;;OAMG;IACH,KAAK,CAAC,OAAO,EAAE,OAAO,GAAG,IAAI;IAO7B;;;;;;;;OAQG;IACH,OAAO,CAAC,aAAa;CAOtB"}
+{"version":3,"file":"de-cache.d.ts","sourceRoot":"","sources":["../../../../src/service/utils/de-cache/de-cache.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,cAAc,EAAE,MAAM,kBAAkB,CAAC;AAMlD,OAAO,EAAE,WAAW,EAAE,MAAM,oBAAoB,CAAC;AAGjD;;;;;;;GAOG;AACH,qBAAa,OAAO;IAaN,SAAS,CAAC,MAAM,EAAE,cAAc;IAZ5C;;;;;;;OAOG;IACH,SAAS,KAAK,UAAU,IAAI,OAAO,CAElC;gBAEqB,MAAM,EAAE,cAAc;IAE5C;;;;;;OAMG;IACH,QAAQ,CAAC,QAAQ,EAAE,GAAG,CAAC,MAAM,EAAE,GAAG,CAAC,MAAM,EAAE,WAAW,CAAC,CAAC,CAAa;IAErE;;;;;;;OAOG;IACH,QAAQ,CAAC,OAAO,EAAE,OAAO,EAAE,MAAM,EAAE,WAAW,GAAG,IAAI;IASrD;;;;;;;OAOG;IACH,WAAW,CAAC,OAAO,EAAE,OAAO,EAAE,MAAM,EAAE,WAAW,GAAG,IAAI;IAMxD;;;;;;;OAOG;IACH,WAAW,CAAC,OAAO,EAAE,OAAO,EAAE,MAAM,EAAE,MAAM,GAAG,IAAI;IAMnD;;;;;;;OAOG;IACH,GAAG,CAAC,OAAO,EAAE,OAAO,EAAE,MAAM,EAAE,WAAW,GAAG,WAAW,GAAG,IAAI;IA2B9D;;;;;;;OAOG;IACH,GAAG,CAAC,OAAO,EAAE,OAAO,EAAE,MAAM,EAAE,MAAM,GAAG,WAAW,GAAG,IAAI;IAazD;;;;;;;OAOG;IACH,MAAM,CAAC,OAAO,EAAE,OAAO,EAAE,MAAM,EAAE,WAAW,GAAG,WAAW,GAAG,IAAI;IAgCjE;;;;;;;OAOG;IACH,MAAM,CAAC,OAAO,EAAE,OAAO,EAAE,MAAM,EAAE,MAAM,GAAG,WAAW,GAAG,IAAI;IAmB5D;;;;;;;;OAQG;IACH,WAAW,CAAC,OAAO,EAAE,OAAO,EAAE,QAAQ,EAAE,WAAW,EAAE,GAAG,WAAW,EAAE;IAsBrE;;;;;;;;OAQG;IACH,WAAW,CAAC,OAAO,EAAE,OAAO,EAAE,QAAQ,EAAE,WAAW,EAAE,GAAG,WAAW,EAAE;IA2BrE;;;;;;;;OAQG;IACH,WAAW,CAAC,OAAO,EAAE,OAAO,EAAE,OAAO,EAAE,MAAM,EAAE,GAAG,MAAM,EAAE;IA4B1D;;;;;;;;OAQG;IACH,SAAS,CAAC,OAAO,EAAE,OAAO,EAAE,MAAM,EAAE,MAAM,GAAG,OAAO;IAMpD;;;;;;;OAOG;IACH,OAAO,CAAC,OAAO,EAAE,OAAO,GAAG,WAAW,EAAE;IAexC;;;;;;;OAOG;IACH,YAAY,CAAC,MAAM,GAAE,OAAY,GAAG,CAAC,CAAC,EAAE,OAAO,EAAE,CAAC,KAAK,OAAO;IAgB9D;;;;;;OAMG;IACH,KAAK,CAAC,OAAO,EAAE,OAAO,GAAG,IAAI;IAO7B;;;;;;;;OAQG;IACH,OAAO,CAAC,aAAa;IAQrB;;;;;OAKG;IACH,SAAS,CAAC,YAAY,CAAC,IAAI,EAAE,WAAW,GAAG,IAAI;CAehD"}

package/out/service/utils/de-cache/de-cache.js

@@ -1,6 +1,8 @@
 import { where, equals, clone, isNil, isEmpty } from 'ramda';
 import { createUUID } from 'qx-util';
+import { RuntimeError } from '@ibiz-template/core';
 import { isExistSessionId, isExistSrfKey, } from '../service-exist-util/service-exist-util';
+import { findModelChild } from '../../../model';
 /**
  * 实体缓存工具类
  *
@@ -10,7 +12,20 @@ import { isExistSessionId, isExistSrfKey, } from '../service-exist-util/service-
  * @class DECache
  */
 export class DECache {
-    constructor() {
+    /**
+     * 是否是联合主键
+     * @author lxm
+     * @date 2023-12-12 02:47:18
+     * @readonly
+     * @protected
+     * @type {boolean}
+     */
+    get isUnionKey() {
+        var _a;
+        return !!((_a = this.entity.unionKeyValueAppDEFieldIds) === null || _a === void 0 ? void 0 : _a.length);
+    }
+    constructor(entity) {
+        this.entity = entity;
         /**
          * 数据缓存
          *
@@ -71,6 +86,13 @@ export class DECache {
      * @memberof EntityCache
      */
     add(context, entity) {
+        // 联合主键相关数据处理
+        if (this.isUnionKey) {
+            this.calcUnionKey(entity);
+            if (this.checkData(context, entity.srfkey)) {
+                throw new RuntimeError(`新建联合主键数据失败，已有主键为${entity.srfkey}的数据`);
+            }
+        }
         try {
             isExistSessionId('add', context);
             if (isNil(entity.srfkey) || isEmpty(entity.srfkey)) {
@@ -117,16 +139,25 @@ export class DECache {
      * @memberof EntityCache
      */
     update(context, entity) {
+        const oldKey = entity.srfkey;
+        // 联合主键相关数据处理
+        if (this.isUnionKey) {
+            this.calcUnionKey(entity);
+            // 主键改变的时候，检测变更之后的主键是否已经存在
+            if (oldKey !== entity.srfkey && this.checkData(context, entity.srfkey)) {
+                throw new RuntimeError(`更新联合主键数据失败，已有主键为${entity.srfkey}的数据`);
+            }
+        }
         try {
             isExistSessionId('update', context);
             isExistSrfKey('update', entity);
             entity.srftempdate = new Date().getTime();
             const map = this.getCacheByTag(context);
-            const data = map.get(entity.srfkey);
+            const data = map.get(oldKey);
             if (data) {
                 data.assign(entity);
-                map.set(entity.srfkey, data);
-                ibiz.log.warn('update', entity.srfkey, entity);
+                map.set(oldKey, data);
+                ibiz.log.warn('update', oldKey, entity);
                 return clone(data);
             }
             throw new Error('数据不存在，无法更新!');
@@ -353,4 +384,23 @@ export class DECache {
         }
         return this.cacheMap.get(tag);
     }
+    /**
+     * 根据联合键值计算主键并赋值
+     * @author lxm
+     * @date 2023-12-12 03:06:30
+     * @param {(IDataEntity | IDataEntity[])} data 需要计算的数据或数据集合
+     */
+    calcUnionKey(data) {
+        const unionKeys = this.entity.unionKeyValueAppDEFieldIds.map(id => {
+            const appField = findModelChild(this.entity.appDEFields || [], id);
+            return appField.codeName.toLowerCase();
+        });
+        const unionValues = unionKeys.map(key => {
+            if (isNil(data[key])) {
+                return `__empty__`;
+            }
+            return data[key];
+        });
+        data.srfkey = unionValues.join('||');
+    }
 }

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

@@ -0,0 +1,19 @@
+import { IDEGantt, IDETreeDataSetNode } from '@ibiz/model-core';
+import { CodeListItem, IGanttNodeData } from '../../../interface';
+import { TreeCodeListNodeData } from '../tree-node-data';
+export declare class GanttCodeListNodeData extends TreeCodeListNodeData implements IGanttNodeData {
+    sndataIteValue: string;
+    beginDataItemValue: string;
+    endDataItemValue: string;
+    prevDataItemValue: string | number;
+    finishDataItemValue: string | number;
+    totalDataItemValue: string | number;
+    children?: IGanttNodeData[] | undefined;
+    constructor(model: IDEGantt, nodeModel: IDETreeDataSetNode, parentNodeData: IGanttNodeData | undefined, opts: {
+        data: CodeListItem;
+        leaf: boolean;
+        navContext?: IParams;
+        navParams?: IParams;
+    });
+}
+//# sourceMappingURL=gantt-code-list-node-data.d.ts.map

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

@@ -0,0 +1 @@
+{"version":3,"file":"gantt-code-list-node-data.d.ts","sourceRoot":"","sources":["../../../../src/service/vo/gantt-node-data/gantt-code-list-node-data.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,QAAQ,EAAE,kBAAkB,EAAE,MAAM,kBAAkB,CAAC;AAChE,OAAO,EAAE,YAAY,EAAE,cAAc,EAAE,MAAM,oBAAoB,CAAC;AAClE,OAAO,EAAE,oBAAoB,EAAE,MAAM,mBAAmB,CAAC;AAGzD,qBAAa,qBACX,SAAQ,oBACR,YAAW,cAAc;IAEzB,cAAc,EAAE,MAAM,CAAC;IAEvB,kBAAkB,EAAE,MAAM,CAAC;IAE3B,gBAAgB,EAAE,MAAM,CAAC;IAEzB,iBAAiB,EAAE,MAAM,GAAG,MAAM,CAAC;IAEnC,mBAAmB,EAAE,MAAM,GAAG,MAAM,CAAC;IAErC,kBAAkB,EAAE,MAAM,GAAG,MAAM,CAAC;IAEpC,QAAQ,CAAC,EAAE,cAAc,EAAE,GAAG,SAAS,CAAC;gBAGtC,KAAK,EAAE,QAAQ,EACf,SAAS,EAAE,kBAAkB,EAC7B,cAAc,EAAE,cAAc,GAAG,SAAS,EAC1C,IAAI,EAAE;QACJ,IAAI,EAAE,YAAY,CAAC;QACnB,IAAI,EAAE,OAAO,CAAC;QACd,UAAU,CAAC,EAAE,OAAO,CAAC;QACrB,SAAS,CAAC,EAAE,OAAO,CAAC;KACrB;CAmCJ"}

package/out/service/vo/gantt-node-data/gantt-code-list-node-data.js

@@ -0,0 +1,14 @@
+import { TreeCodeListNodeData } from '../tree-node-data';
+import { calcDataItemValue } from './gantt-node-data-util';
+export class GanttCodeListNodeData extends TreeCodeListNodeData {
+    constructor(model, nodeModel, parentNodeData, opts) {
+        super(nodeModel, parentNodeData, opts);
+        const { data } = opts;
+        this.sndataIteValue = calcDataItemValue(model.sndataItemName, nodeModel, data);
+        this.beginDataItemValue = calcDataItemValue(model.beginDataItemName, nodeModel, data);
+        this.endDataItemValue = calcDataItemValue(model.endDataItemName, nodeModel, data);
+        this.prevDataItemValue = calcDataItemValue(model.prevDataItemName, nodeModel, data);
+        this.finishDataItemValue = calcDataItemValue(model.finishDataItemName, nodeModel, data);
+        this.totalDataItemValue = calcDataItemValue(model.totalDataItemName, nodeModel, data);
+    }
+}

package/out/service/vo/gantt-node-data/gantt-data-set-node-data.d.ts

@@ -0,0 +1,19 @@
+import { IDEGantt, IDETreeDataSetNode } from '@ibiz/model-core';
+import { IGanttNodeData } from '../../../interface';
+import { TreeDataSetNodeData } from '../tree-node-data';
+export declare class GanttDataSetNodeData extends TreeDataSetNodeData implements IGanttNodeData {
+    sndataIteValue: string;
+    beginDataItemValue: string;
+    endDataItemValue: string;
+    prevDataItemValue: string | number;
+    finishDataItemValue: string | number;
+    totalDataItemValue: string | number;
+    children?: IGanttNodeData[] | undefined;
+    constructor(model: IDEGantt, nodeModel: IDETreeDataSetNode, parentNodeData: IGanttNodeData | undefined, opts: {
+        data: IData;
+        leaf: boolean;
+        navContext?: IParams;
+        navParams?: IParams;
+    });
+}
+//# sourceMappingURL=gantt-data-set-node-data.d.ts.map

package/out/service/vo/gantt-node-data/gantt-data-set-node-data.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"gantt-data-set-node-data.d.ts","sourceRoot":"","sources":["../../../../src/service/vo/gantt-node-data/gantt-data-set-node-data.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,QAAQ,EAAE,kBAAkB,EAAE,MAAM,kBAAkB,CAAC;AAChE,OAAO,EAAE,cAAc,EAAE,MAAM,oBAAoB,CAAC;AACpD,OAAO,EAAE,mBAAmB,EAAE,MAAM,mBAAmB,CAAC;AAGxD,qBAAa,oBACX,SAAQ,mBACR,YAAW,cAAc;IAEzB,cAAc,EAAE,MAAM,CAAC;IAEvB,kBAAkB,EAAE,MAAM,CAAC;IAE3B,gBAAgB,EAAE,MAAM,CAAC;IAEzB,iBAAiB,EAAE,MAAM,GAAG,MAAM,CAAC;IAEnC,mBAAmB,EAAE,MAAM,GAAG,MAAM,CAAC;IAErC,kBAAkB,EAAE,MAAM,GAAG,MAAM,CAAC;IAEpC,QAAQ,CAAC,EAAE,cAAc,EAAE,GAAG,SAAS,CAAC;gBAGtC,KAAK,EAAE,QAAQ,EACf,SAAS,EAAE,kBAAkB,EAC7B,cAAc,EAAE,cAAc,GAAG,SAAS,EAC1C,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;CAmCJ"}

package/out/service/vo/gantt-node-data/gantt-data-set-node-data.js

@@ -0,0 +1,14 @@
+import { TreeDataSetNodeData } from '../tree-node-data';
+import { calcDataItemValue } from './gantt-node-data-util';
+export class GanttDataSetNodeData extends TreeDataSetNodeData {
+    constructor(model, nodeModel, parentNodeData, opts) {
+        super(nodeModel, parentNodeData, opts);
+        const { data } = opts;
+        this.sndataIteValue = calcDataItemValue(model.sndataItemName, nodeModel, data);
+        this.beginDataItemValue = calcDataItemValue(model.beginDataItemName, nodeModel, data);
+        this.endDataItemValue = calcDataItemValue(model.endDataItemName, nodeModel, data);
+        this.prevDataItemValue = calcDataItemValue(model.prevDataItemName, nodeModel, data);
+        this.finishDataItemValue = calcDataItemValue(model.finishDataItemName, nodeModel, data);
+        this.totalDataItemValue = calcDataItemValue(model.totalDataItemName, nodeModel, data);
+    }
+}