@ibiz-template/runtime 0.5.0-beta.5 → 0.5.1-beta.1

package/src/interface/controller/state/control/i-tree.state.ts

@@ -12,6 +12,8 @@ import { IMDControlState } from './i-md-control.state';
 export interface ITreeState extends IMDControlState {
   items: ITreeNodeData[];
 
+  selectedData: ITreeNodeData[];
+
   /**
    * 树的根节点
    *
@@ -69,7 +71,7 @@ export interface ITreeState extends IMDControlState {
  * @export
  * @class ITreeNodeData
  */
-export interface ITreeNodeData extends IData {
+export interface ITreeNodeData {
   /**
    * 节点数据的唯一标识（创建的时候自动生成）
    * @author lxm
@@ -92,7 +94,7 @@ export interface ITreeNodeData extends IData {
    * @type {string}
    * @memberof ITreeNodeData
    */
-  nodeId: string;
+  _nodeId: string;
 
   /**
    * 节点唯一标识，在父的id上加上自身的唯一标识，用>分隔
@@ -101,7 +103,7 @@ export interface ITreeNodeData extends IData {
    * @type {string}
    * @memberof ITreeNodeData
    */
-  id: string;
+  _id: string;
 
   /**
    * 节点的值(可能是自己的主键，也可能是沿用父的值)
@@ -110,7 +112,7 @@ export interface ITreeNodeData extends IData {
    * @type {string}
    * @memberof ITreeNodeData
    */
-  value?: string;
+  _value?: string;
 
   /**
    * 节点显示名称
@@ -118,7 +120,7 @@ export interface ITreeNodeData extends IData {
    * @type {string}
    * @memberof ITreeNodeData
    */
-  text: string;
+  _text: string;
 
   /**
    * 是否是叶子节点（没有子节点的节点）
@@ -126,7 +128,7 @@ export interface ITreeNodeData extends IData {
    * @type {boolean}
    * @memberof ITreeNodeData
    */
-  leaf: boolean;
+  _leaf: boolean;
 
   /**
    * 资源路径相关上下文参数
@@ -136,7 +138,7 @@ export interface ITreeNodeData extends IData {
    * @type {IParams}
    * @memberof ITreeNodeData
    */
-  context?: IParams;
+  _context?: IParams;
 
   /**
    * 关系上转换的视图参数
@@ -144,7 +146,7 @@ export interface ITreeNodeData extends IData {
    * @type {IParams}
    * @memberof ITreeNodeData
    */
-  params?: IParams;
+  _params?: IParams;
 
   /**
    * 子节点集合（没有子节点则不存在）
@@ -152,7 +154,7 @@ export interface ITreeNodeData extends IData {
    * @type {ITreeNodeData[]}
    * @memberof ITreeNodeData
    */
-  children?: ITreeNodeData[];
+  _children?: ITreeNodeData[];
 
   /**
    * 父节点数据对象
@@ -160,7 +162,7 @@ export interface ITreeNodeData extends IData {
    * @type {ITreeNodeData}
    * @memberof ITreeNodeData
    */
-  parent?: ITreeNodeData;
+  _parent?: ITreeNodeData;
 
   /**
    * 实体数据
@@ -168,39 +170,39 @@ export interface ITreeNodeData extends IData {
    * @type {IData}
    * @memberof ITreeNodeData
    */
-  deData?: IData;
+  _deData?: IData;
 
   /**
-   * 实体主键
+   * 图标
    * @author lxm
-   * @date 2023-05-29 09:28:59
-   * @type {string}
+   * @date 2023-08-15 02:02:49
+   * @type {IIcon}
    */
-  srfkey?: string;
+  _icon?: IIcon;
 
   /**
-   * 实体主信息
+   * 节点文本的html显示
    * @author lxm
-   * @date 2023-05-29 09:29:00
+   * @date 2023-08-15 02:15:09
    * @type {string}
    */
-  srfmajortext?: string;
+  _textHtml?: string;
 
   /**
-   * 图标
+   * 作为实体数据时的主键
    * @author lxm
-   * @date 2023-08-15 02:02:49
-   * @type {IIcon}
+   * @date 2023-05-29 09:28:59
+   * @type {string}
    */
-  icon?: IIcon;
+  srfkey?: string;
 
   /**
-   * 节点文本的html显示
+   * 作为实体数据时的主信息
    * @author lxm
-   * @date 2023-08-15 02:15:09
+   * @date 2023-05-29 09:29:00
    * @type {string}
    */
-  textHtml?: string;
+  srfmajortext?: string;
 
   // todo 其他界面绘制相关属性
 }

package/src/interface/service/service/i-auth.service.ts

@@ -1,3 +1,21 @@
+export interface IAuthInfo {
+  /**
+   * 是否是匿名账户登录
+   * @author lxm
+   * @date 2024-01-03 05:25:31
+   * @type {boolean}
+   */
+  isAnonymous: boolean;
+
+  /**
+   * 访问令牌
+   * @author lxm
+   * @date 2024-01-03 05:30:43
+   * @type {string}
+   */
+  token: string;
+}
+
 /**
  * 认证服务
  *
@@ -59,4 +77,12 @@ export interface IAuthService {
    * @return {*}  {Promise<void>}
    */
   extendLogin(): Promise<void>;
+
+  /**
+   * 获取当前环境的权限信息（无登录则返回undefined）
+   * @author lxm
+   * @date 2024-01-03 05:31:48
+   * @return {*}  {(Promise<IAuthInfo | undefined>)}
+   */
+  getAuthInfo(): IAuthInfo | undefined;
 }

package/src/interface/service/service/index.ts

@@ -1,7 +1,7 @@
 export type { IAppDeAuthorityService } from './i-app-de-authority.service';
 export type { IConfigService } from './i-config.service';
 export type { IAppDEService } from './i-app-de.service';
-export type { IAuthService } from './i-auth.service';
+export type { IAuthService, IAuthInfo } from './i-auth.service';
 export type { IFileService } from './i-file.service';
 export type { IWorkFlowService } from './i-wf.service';
 export type { IAsyncActionService } from './i-async-action.service';

package/src/service/service/auth/v7-auth.service.ts

@@ -1,6 +1,7 @@
 import { CoreConst, HttpError } from '@ibiz-template/core';
 import { clearCookie, getCookie, setCookie } from 'qx-util';
 import { IAuthService } from '../../../interface';
+import { IAuthInfo } from '../../../interface/service/service/i-auth.service';
 
 /**
  * 认证服务
@@ -11,7 +12,9 @@ import { IAuthService } from '../../../interface';
  * @class AuthService
  */
 export class V7AuthService implements IAuthService {
-  isAnonymous = false;
+  get isAnonymous(): boolean {
+    return getCookie(CoreConst.IS_ANONYMOUS) === '1';
+  }
 
   async anonymousLogin(): Promise<boolean> {
     const { anonymousUser, anonymousPwd } = ibiz.env;
@@ -21,7 +24,15 @@ export class V7AuthService implements IAuthService {
     }
     const result = await this.login(anonymousUser, anonymousPwd);
     if (result) {
-      this.isAnonymous = true;
+      setCookie(CoreConst.IS_ANONYMOUS, '1', 0, true);
+
+      // 全部改成session级别的
+      const token = getCookie(CoreConst.TOKEN)!;
+      const expirein = getCookie(CoreConst.TOKEN_EXPIRES)!;
+      const remember = getCookie(CoreConst.TOKEN_REMEMBER)!;
+      setCookie(CoreConst.TOKEN, token, 0, true);
+      setCookie(CoreConst.TOKEN_EXPIRES, expirein, 0, true);
+      setCookie(CoreConst.TOKEN_REMEMBER, remember, 0, true);
     }
     return result;
   }
@@ -52,6 +63,7 @@ export class V7AuthService implements IAuthService {
           remember ? 7 : 0,
           true,
         );
+        clearCookie(CoreConst.IS_ANONYMOUS);
       }
       return true;
     } catch (err: unknown) {
@@ -69,6 +81,7 @@ export class V7AuthService implements IAuthService {
       clearCookie(CoreConst.TOKEN);
       clearCookie(CoreConst.TOKEN_EXPIRES);
       clearCookie(CoreConst.TOKEN_REMEMBER);
+      clearCookie(CoreConst.IS_ANONYMOUS);
       return true;
     } catch (err: unknown) {
       ibiz.notification.error({
@@ -80,6 +93,11 @@ export class V7AuthService implements IAuthService {
   }
 
   async extendLogin(): Promise<void> {
+    if (this.isAnonymous) {
+      // 匿名登录不需要延长都是会话级的
+      return;
+    }
+
     const token = getCookie(CoreConst.TOKEN);
     const expirein = getCookie(CoreConst.TOKEN_EXPIRES);
     const remember = getCookie(CoreConst.TOKEN_REMEMBER);
@@ -106,4 +124,15 @@ export class V7AuthService implements IAuthService {
       }, wait);
     }
   }
+
+  getAuthInfo(): IAuthInfo | undefined {
+    const token = getCookie(CoreConst.TOKEN);
+    const isAnonymous = !!getCookie(CoreConst.IS_ANONYMOUS);
+    return token
+      ? {
+          token,
+          isAnonymous,
+        }
+      : undefined;
+  }
 }

package/src/service/service/entity/method/de-action.ts

@@ -337,7 +337,7 @@ export class DEActionMethod extends Method {
     try {
       let key = null;
       if (params) {
-        // key = params[this.entity.keyName];
+        key = params[this.entity.keyAppDEFieldId!.toLowerCase()];
       }
       if (!key && context) {
         key = context[this.entity.codeName!.toLowerCase()];
@@ -406,7 +406,7 @@ export class DEActionMethod extends Method {
     try {
       let key = null;
       if (params) {
-        // key = params[this.entity.keyName];
+        key = params[this.entity.keyAppDEFieldId!.toLowerCase()];
       }
       if (!key && context) {
         key = context[this.entity.codeName!.toLowerCase()];
@@ -467,7 +467,8 @@ export class DEActionMethod extends Method {
         const majorLowerCodeName = majorDECodeName.toLowerCase();
         const pickupLowerDEFName = pickupDEFName.toLowerCase();
         const majorkey = context[majorLowerCodeName];
-        if (majorkey) {
+        // 父主键不能是自身，否则自关系的时候就改错了
+        if (majorkey && majorkey !== data.srfkey) {
           data[pickupLowerDEFName] = majorkey;
         }
       });

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

@@ -19,9 +19,9 @@ export class GanttCodeListNodeData
 
   totalDataItemValue: string | number;
 
-  children?: IGanttNodeData[] | undefined;
+  _children?: IGanttNodeData[] | undefined;
 
-  parent?: IGanttNodeData;
+  _parent?: IGanttNodeData;
 
   constructor(
     model: IDEGantt,

package/src/service/vo/gantt-node-data/gantt-data-set-node-data.ts

@@ -19,9 +19,9 @@ export class GanttDataSetNodeData
 
   totalDataItemValue: string | number;
 
-  children?: IGanttNodeData[] | undefined;
+  _children?: IGanttNodeData[] | undefined;
 
-  parent?: IGanttNodeData;
+  _parent?: IGanttNodeData;
 
   constructor(
     model: IDEGantt,

package/src/service/vo/gantt-node-data/gantt-static-node-data.ts

@@ -19,9 +19,9 @@ export class GanttStaticNodeData
 
   totalDataItemValue: string | number;
 
-  children?: IGanttNodeData[] | undefined;
+  _children?: IGanttNodeData[] | undefined;
 
-  parent?: IGanttNodeData;
+  _parent?: IGanttNodeData;
 
   constructor(
     model: IDEGantt,

package/src/service/vo/tree-node-data/tree-code-list-node-data.ts

@@ -15,11 +15,11 @@ export class TreeCodeListNodeData
   extends TreeNodeData
   implements ITreeNodeData
 {
-  text: string;
+  _text: string;
 
-  id!: string;
+  _id!: string;
 
-  value: string;
+  _value: string;
 
   constructor(
     model: IDETreeDataSetNode,
@@ -33,14 +33,14 @@ export class TreeCodeListNodeData
   ) {
     super(model, parentNodeData, opts);
     const { data } = opts;
-    this.text = data.text;
-    this.value = data.value as string;
+    this._text = data.text;
+    this._value = data.value as string;
 
     // id小写
-    const selfId = `${model.id}@${this.value}`.toLowerCase();
+    const selfId = `${model.id}@${this._value}`.toLowerCase();
     Object.defineProperty(this, 'id', {
       get() {
-        return this.parent ? `${this.parent.id}:${selfId}` : selfId;
+        return this._parent ? `${this._parent.id}:${selfId}` : selfId;
       },
       enumerable: true,
       configurable: true,
@@ -49,14 +49,14 @@ export class TreeCodeListNodeData
     // 实体节点额外添加上自己的实体上下文
     if (model.appDataEntityId) {
       const deName = calcDeCodeNameById(model.appDataEntityId);
-      this.context = Object.assign(this.context || {}, {
-        [deName]: this.value,
+      this._context = Object.assign(this._context || {}, {
+        [deName]: this._value,
       });
     }
 
-    this.srfkey = this.value;
-    this.srfmajortext = this.text;
+    this.srfkey = this._value;
+    this.srfmajortext = this._text;
 
-    this.icon = this.calcIcon(model);
+    this._icon = this.calcIcon(model);
   }
 }

package/src/service/vo/tree-node-data/tree-data-set-node-data.ts

@@ -16,13 +16,13 @@ import { fieldValueToBoolean } from '../../utils';
  * @implements {ITreeNodeData}
  */
 export class TreeDataSetNodeData extends TreeNodeData implements ITreeNodeData {
-  text: string;
+  _text: string;
 
-  id!: string;
+  _id!: string;
 
-  value: string;
+  _value: string;
 
-  deData: IData;
+  _deData: IData;
 
   constructor(
     model: IDETreeDataSetNode,
@@ -36,11 +36,11 @@ export class TreeDataSetNodeData extends TreeNodeData implements ITreeNodeData {
   ) {
     super(model, parentNodeData, opts);
     const { data } = opts;
-    this.deData = data;
-    this.text = model.textAppDEFieldId
+    this._deData = data;
+    this._text = model.textAppDEFieldId
       ? data[model.textAppDEFieldId]
       : data.srfmajortext;
-    this.value = model.idAppDEFieldId
+    this._value = model.idAppDEFieldId
       ? data[model.idAppDEFieldId]
       : data.srfkey;
 
@@ -48,7 +48,7 @@ export class TreeDataSetNodeData extends TreeNodeData implements ITreeNodeData {
     const selfId = `${model.id}@${data.srfkey}`.toLowerCase();
     Object.defineProperty(this, 'id', {
       get() {
-        return this.parent ? `${this.parent.id}:${selfId}` : selfId;
+        return this._parent ? `${this._parent.id}:${selfId}` : selfId;
       },
       enumerable: true,
       configurable: true,
@@ -57,20 +57,17 @@ export class TreeDataSetNodeData extends TreeNodeData implements ITreeNodeData {
     // 实体节点额外添加上自己的实体上下文
     if (model.appDataEntityId) {
       const deName = calcDeCodeNameById(model.appDataEntityId);
-      this.context = Object.assign(this.context || {}, {
+      this._context = Object.assign(this._context || {}, {
         [deName]: data.srfkey,
       });
     }
 
-    this.srfkey = this.deData.srfkey;
-    this.srfmajortext = this.deData.srfmajortext;
-
-    this.icon = this.calcIcon(model);
-    this.textHtml = this.calcTextHtml(model);
+    this._icon = this.calcIcon(model);
+    this._textHtml = this.calcTextHtml(model);
 
     // 识别叶子节点标识属性，根据后台数据赋值leaf
     if (model.leafFlagAppDEFieldId) {
-      this.leaf = fieldValueToBoolean(data[model.leafFlagAppDEFieldId]);
+      this._leaf = fieldValueToBoolean(data[model.leafFlagAppDEFieldId]);
     }
 
     /** 数据项映射 */
@@ -88,25 +85,25 @@ export class TreeDataSetNodeData extends TreeNodeData implements ITreeNodeData {
 
     return new Proxy<TreeDataSetNodeData>(this, {
       set(target, p, value): boolean {
-        if (Object.prototype.hasOwnProperty.call(target.deData, p)) {
-          target.deData[p] = value;
+        if (Object.prototype.hasOwnProperty.call(target._deData, p)) {
+          target._deData[p] = value;
         } else if (dataItemkeyMap.has(p)) {
-          target.deData[dataItemkeyMap.get(p)!] = value;
+          target._deData[dataItemkeyMap.get(p)!] = value;
         } else {
-          target[p] = value;
+          (target as IData)[p] = value;
         }
         return true;
       },
 
       get(target, p, _receiver): unknown {
-        if (target[p] !== undefined) {
-          return target[p];
+        if ((target as IData)[p] !== undefined) {
+          return (target as IData)[p];
         }
         if (dataItemkeyMap.has(p)) {
-          return target.deData[dataItemkeyMap.get(p)!] || dataItemDefaults[p];
+          return target._deData[dataItemkeyMap.get(p)!] || dataItemDefaults[p];
         }
-        if (target.deData[p] !== undefined) {
-          return target.deData[p];
+        if (target._deData[p] !== undefined) {
+          return target._deData[p];
         }
       },
 
@@ -116,7 +113,7 @@ export class TreeDataSetNodeData extends TreeNodeData implements ITreeNodeData {
           ...new Set([
             ...Object.keys(target),
             ...dataItemkeyMap.keys(),
-            ...Object.keys(target.deData),
+            ...Object.keys(target._deData),
           ]),
         ];
         updateKeyDefine(target, allKeys);
@@ -128,12 +125,12 @@ export class TreeDataSetNodeData extends TreeNodeData implements ITreeNodeData {
   protected calcIcon(model: IDETreeDataSetNode): IIcon | undefined {
     const icon = super.calcIcon(model) || {};
     const { iconAppDEFieldId, detreeNodeDataItems } = model;
-    if (iconAppDEFieldId && this.deData[iconAppDEFieldId]) {
-      icon.imagePath = this.deData[iconAppDEFieldId];
+    if (iconAppDEFieldId && this._deData[iconAppDEFieldId]) {
+      icon.imagePath = this._deData[iconAppDEFieldId];
     }
 
     if (icon) {
-      this.icon = icon;
+      this._icon = icon;
     }
     const iconDataItem = detreeNodeDataItems?.find(item => item.id === 'icon');
     if (iconDataItem) {
@@ -155,7 +152,7 @@ export class TreeDataSetNodeData extends TreeNodeData implements ITreeNodeData {
   ): string | undefined {
     if (dataItem.customCode && dataItem.scriptCode) {
       return ScriptFactory.execScriptFn(
-        { data: this.deData },
+        { data: this._deData },
         dataItem.scriptCode,
         {
           isAsync: false,

package/src/service/vo/tree-node-data/tree-node-data.ts

@@ -14,61 +14,61 @@ export abstract class TreeNodeData implements ITreeNodeData {
 
   _nodeType: string;
 
-  id!: string;
+  _id!: string;
 
-  value?: string | undefined;
+  _value?: string | undefined;
 
-  text!: string;
+  _text!: string;
 
-  children?: ITreeNodeData[] | undefined;
+  _children?: ITreeNodeData[] | undefined;
 
-  deData?: IData | undefined;
+  _deData?: IData | undefined;
 
   srfkey?: string | undefined;
 
   srfmajortext?: string | undefined;
 
-  nodeId: string;
+  _nodeId: string;
 
-  leaf: boolean = false;
+  _leaf: boolean = false;
 
-  context?: IParams;
+  _context?: IParams;
 
-  params?: IParams;
+  _params?: IParams;
 
-  parent?: ITreeNodeData;
+  _parent?: ITreeNodeData;
 
-  icon?: IIcon;
+  _icon?: IIcon;
 
-  textHtml?: string;
+  _textHtml?: string;
 
   // eslint-disable-next-line @typescript-eslint/no-explicit-any
-  [key: string | symbol]: any;
+  // [key: string | symbol]: any;
 
   constructor(
     model: IDETreeNode,
     parentNodeData: ITreeNodeData | undefined,
     opts: { leaf: boolean; navContext?: IParams; navParams?: IParams },
   ) {
-    this.leaf = opts.leaf === true;
-    this.parent = parentNodeData;
+    this._leaf = opts.leaf === true;
+    this._parent = parentNodeData;
     this._nodeType = model.treeNodeType!;
 
     // 所有节点都要继承父的上下文，如果父存在则复制父的资源上下文，否则返回空对象。
-    if (this.parent) {
-      this.context = { ...this.parent.context };
+    if (this._parent) {
+      this._context = { ...this._parent._context };
     }
 
     // 附加导航上下文和视图参数
     if (opts.navContext) {
-      this.context = Object.assign(this.context || {}, opts.navContext);
+      this._context = Object.assign(this._context || {}, opts.navContext);
     }
 
     if (opts.navParams) {
-      this.params = { ...opts.navParams };
+      this._params = { ...opts.navParams };
     }
 
-    this.nodeId = model.id!;
+    this._nodeId = model.id!;
   }
 
   /**

package/src/service/vo/tree-node-data/tree-static-node-data.ts

@@ -11,13 +11,13 @@ import { TreeNodeData } from './tree-node-data';
  * @implements {ITreeNodeData}
  */
 export class TreeStaticNodeData extends TreeNodeData implements ITreeNodeData {
-  text: string;
+  _text: string;
 
-  id!: string;
+  _id!: string;
 
-  value?: string;
+  _value?: string;
 
-  deData?: IData;
+  _deData?: IData;
 
   constructor(
     model: IDETreeStaticNode,
@@ -32,32 +32,32 @@ export class TreeStaticNodeData extends TreeNodeData implements ITreeNodeData {
     const selfId = `${model.id}`.toLowerCase();
     Object.defineProperty(this, 'id', {
       get() {
-        return this.parent ? `${this.parent.id}:${selfId}` : selfId;
+        return this._parent ? `${this._parent.id}:${selfId}` : selfId;
       },
       enumerable: true,
       configurable: true,
     });
 
-    this.text = model.text!;
-    this.value = nodeValue;
+    this._text = model.text!;
+    this._value = nodeValue;
 
     // 静态节点数据去对应级别的父节点数据
     if (parentNodeData && opts.parentValueLevel) {
       // 根据父值级别查找父数据
       let parent: ITreeNodeData | undefined = parentNodeData;
       for (let index = 1; index < opts.parentValueLevel!; index++) {
-        parent = parent?.parent;
+        parent = parent?._parent;
       }
-      if (parent?.deData) {
-        this.deData = parent.deData;
+      if (parent?._deData) {
+        this._deData = parent._deData;
       }
       // 静态节点值不存在时，取父数据的值
-      this.value = nodeValue || parent?.value;
+      this._value = nodeValue || parent?._value;
     }
 
-    this.srfkey = this.deData?.srfkey || this.value;
-    this.srfmajortext = this.deData?.srfmajortext || this.text;
+    this.srfkey = this._deData?.srfkey || this._value;
+    this.srfmajortext = this._deData?.srfmajortext || this._text;
 
-    this.icon = this.calcIcon(model);
+    this._icon = this.calcIcon(model);
   }
 }