@ibiz-template/runtime 0.1.21 → 0.1.22

package/src/controller/control/kanban/kanban.service.ts

@@ -0,0 +1,33 @@
+import { IHttpResponse } from '@ibiz-template/core';
+import { IDEKanban } from '@ibiz/model-core';
+import { ControlVO } from '../../../service';
+import { DataViewControlService } from '../data-view';
+
+/**
+ * 看板（kanban）部件服务
+ *
+ * @export
+ * @class DataViewControlService
+ * @extends {MDControlService<IDEDataView>}
+ */
+export class KanbanService extends DataViewControlService<IDEKanban> {
+  /**
+   * 更新分组数据
+   *
+   * @author lxm
+   * @date 2022-09-07 19:09:11
+   * @param {IParams} context 上下文
+   * @param {ControlVO} data 数据
+   * @returns {*}
+   */
+  async updateGroup(
+    context: IParams,
+    data: ControlVO,
+  ): Promise<IHttpResponse<ControlVO>> {
+    const updateAction =
+      this.model.updateGroupControlAction?.appDEMethodId || 'update';
+    let res = await this.exec(updateAction, context, data.getOrigin());
+    res = this.handleResponse(res);
+    return res as IHttpResponse<ControlVO>;
+  }
+}

package/src/controller/control/list/list.controller.ts

@@ -181,6 +181,7 @@ export class ListController
       childrenMap.forEach((value: IData[], key: string) => {
         groups.push({
           caption: key,
+          key,
           children: [...value],
         });
       });
@@ -211,6 +212,7 @@ export class ListController
         );
         groups.push({
           caption: codeListItem.text,
+          key: codeListItem.value,
           children: [...value],
         });
         keys.push(codeListItem.value as string);
@@ -221,6 +223,7 @@ export class ListController
       if (otherGroup.length > 0) {
         groups.push({
           caption: '其他',
+          key: '其他',
           children: [...otherGroup],
         });
       }

package/src/controller/control/list/list.service.ts

@@ -28,6 +28,7 @@ export class ListService extends MDControlService<IDEList> {
         const deFieldKey = deField.toLowerCase();
         mapField = new UIMapField(uiKey, deFieldKey, {
           isOriginField: true,
+          dataType: item.dataType,
         });
       } else {
         // 前台属性

package/src/controller/control/md-ctrl/md-ctrl.service.ts

@@ -29,6 +29,7 @@ export class MDCtrlService extends MDControlService<IDEMobMDCtrl> {
         const deFieldKey = deField.toLowerCase();
         mapField = new UIMapField(uiKey, deFieldKey, {
           isOriginField: true,
+          dataType: item.dataType,
         });
       } else {
         // 前台属性

package/src/controller/control/pickup-view-panel/pickup-view-panel.controller.ts

@@ -1,4 +1,5 @@
 import { IAppDEGridView, IDEPickupViewPanel } from '@ibiz/model-core';
+import { ViewCallTag } from '../../../constant';
 import {
   IPickupViewPanelState,
   IPickupViewPanelEvent,
@@ -119,7 +120,7 @@ export class PickupViewPanelController
    * @memberof PickupViewPanelController
    */
   async getSelectedData(): Promise<IData[]> {
-    const items: IData[] = await this.embedView.call('GetData');
+    const items: IData[] = await this.embedView.call(ViewCallTag.GET_DATA);
     return items;
   }
 
@@ -132,7 +133,7 @@ export class PickupViewPanelController
    * @memberof PickupViewPanelController
    */
   async getAllData(): Promise<IData[]> {
-    const items: IData[] = await this.embedView.call('GetAllData');
+    const items: IData[] = await this.embedView.call(ViewCallTag.GET_ALL_DATA);
     return items;
   }
 }

package/src/controller/control/toolbar/toolbar.controllerr.ts

@@ -5,7 +5,7 @@ import {
   IDETBUIActionItem,
   IControlLogic,
 } from '@ibiz/model-core';
-import { ViewMode } from '../../../constant';
+import { ViewCallTag, ViewMode } from '../../../constant';
 import {
   IToolbarState,
   IToolbarEvent,
@@ -69,7 +69,7 @@ export class ToolbarController<
     // 执行界面行为
     if (item.itemType === 'DEUIACTION') {
       const actionId = (item as IDETBUIActionItem).uiactionId;
-      const res = await this.ctx.view.call('GetData');
+      const res = await this.ctx.view.call(ViewCallTag.GET_DATA);
       const data = res || [];
       const args = this.getEventArgs();
       args.params = Object.assign(param, args.params);

package/src/controller/ctx/ctx.ts

@@ -42,6 +42,15 @@ export class CTX<V extends IViewController = IViewController> {
    */
   view!: V;
 
+  /**
+   * 是否已经销毁
+   *
+   * @author chitanda
+   * @date 2023-09-11 11:09:57
+   * @protected
+   */
+  protected isDestroyed = false;
+
   /**
    * CTX事件
    * @author lxm
@@ -90,6 +99,7 @@ export class CTX<V extends IViewController = IViewController> {
     this.controllersMap.clear();
     this.view = null as any;
     this.state = null as any;
+    this.isDestroyed = true;
   }
 
   /**
@@ -118,6 +128,9 @@ export class CTX<V extends IViewController = IViewController> {
    * @date 2023-03-27 01:59:35
    */
   endLoading(): void {
+    if (this.isDestroyed) {
+      return;
+    }
     this.view.endLoading();
   }
 

package/src/de-logic/utils/handle-src-val.ts

@@ -56,12 +56,14 @@ export function handleSrcVal(
     // 直接值
     case 'SRCVALUE':
       return srcValue;
-    // 视图参数
-    case 'VIEWPARAM':
+    case 'WEBCONTEXT': // 网页请求上下文
+    case 'VIEWPARAM': // 视图参数
       value = ctx.viewParams;
       break;
-    // 应用上下文
-    case 'APPDATA':
+    case 'APPLICATION': // 系统全局对象
+    case 'SESSION': // 用户全局对象
+    case 'APPDATA': // 应用上下文
+    case 'DATACONTEXT': // 数据上下文
       value = ctx.context;
       break;
     // 当前环境参数

package/src/engine/view-base.engine.ts

@@ -1,4 +1,5 @@
 import { RuntimeError } from '@ibiz-template/core';
+import { ViewCallTag } from '../constant';
 import {
   IViewController,
   IToolbarController,
@@ -119,7 +120,7 @@ export class ViewEngineBase implements IViewEngine {
   }
 
   async call(key: string, _args?: IData): Promise<IData | null | undefined> {
-    if (key === 'GetData') {
+    if (key === ViewCallTag.GET_DATA) {
       return this.getData();
     }
     return undefined;

package/src/interface/controller/controller/common/i-drag-change-info.ts

@@ -0,0 +1,40 @@
+/**
+ * 拖拽变更信息
+ * @author lxm
+ * @date 2023-08-30 04:23:41
+ * @export
+ * @interface IDragChangeInfo
+ */
+export interface IDragChangeInfo {
+  /**
+   * 变更前的分组标识
+   * @author lxm
+   * @date 2023-08-30 04:24:25
+   * @type {string}
+   */
+  from: string | number;
+
+  /**
+   * 变更后的分组标识
+   * @author lxm
+   * @date 2023-08-30 04:24:45
+   * @type {string}
+   */
+  to: string | number;
+
+  /**
+   * 变更前的索引位置
+   * @author lxm
+   * @date 2023-08-30 04:25:02
+   * @type {number}
+   */
+  fromIndex: number;
+
+  /**
+   * 变更后的索引位置
+   * @author lxm
+   * @date 2023-08-30 04:24:53
+   * @type {number}
+   */
+  toIndex: number;
+}

package/src/interface/controller/controller/common/index.ts

@@ -1 +1,2 @@
 export * from './i-enforceable.controller';
+export * from './i-drag-change-info';

package/src/interface/controller/controller/control/i-data-view-control.controller.ts

@@ -10,12 +10,11 @@ import { IMDControlController } from './i-md-control.controller';
  * @interface IDataViewControlController
  * @extends {IMDControlController<IDEDataView, IDataViewControlState, IDataViewControlEvent>}
  */
-export interface IDataViewControlController
-  extends IMDControlController<
-    IDEDataView,
-    IDataViewControlState,
-    IDataViewControlEvent
-  > {
+export interface IDataViewControlController<
+  T extends IDEDataView = IDEDataView,
+  S extends IDataViewControlState = IDataViewControlState,
+  E extends IDataViewControlEvent = IDataViewControlEvent,
+> extends IMDControlController<T, S, E> {
   /**
    * 加载更多
    *

package/src/interface/controller/controller/control/i-kanban.controller.ts

@@ -0,0 +1,14 @@
+import { IDEKanban } from '@ibiz/model-core';
+import { IKanbanEvent } from '../../event';
+import { IKanbanState } from '../../state';
+import { IDataViewControlController } from './i-data-view-control.controller';
+
+/**
+ * 看板部件控制器
+ *
+ * @export
+ * @interface IDataViewControlController
+ * @extends {IMDControlController<IDEDataView, IDataViewControlState, IDataViewControlEvent>}
+ */
+export interface IKanbanController
+  extends IDataViewControlController<IDEKanban, IKanbanState, IKanbanEvent> {}

package/src/interface/controller/controller/control/index.ts

@@ -30,3 +30,4 @@ export * from './portlet/index';
 export * from './i-calendar.controller';
 export * from './i-calendar-exp-bar.controller';
 export * from './i-context-menu.controller';
+export * from './i-kanban.controller';

package/src/interface/controller/event/control/i-kanban.event.ts

@@ -1,11 +1,11 @@
-import { IMDControlEvent } from './i-md-control.event';
+import { IDataViewControlEvent } from './i-data-view-control.event';
 
 /**
- * 看板部件事件
+ * 看板(kanban)部件事件
  *
  * @author lxm
  * @date 2022-08-30 16:08:43
  * @export
  * @interface IMDControlEvent
  */
-export type IKanbanEvent = IMDControlEvent;
+export type IKanbanEvent = IDataViewControlEvent;

package/src/interface/controller/event/view/i-kanban-view.event.ts

@@ -1,7 +1,7 @@
 import { IMDViewEvent } from './i-md-view.event';
 
 /**
- * 看板视图事件
+ * 看板kanban视图事件
  *
  * @author lxm
  * @date 2022-09-13 10:09:00

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

@@ -0,0 +1,35 @@
+import { IButtonContainerState } from '../../common';
+import { IDataViewControlState } from './i-data-view-control.state';
+
+/**
+ * 看板部件（kanban）部件状态
+ *
+ * @export
+ * @interface IDataViewControlState
+ * @extends {IMDControlState}
+ */
+export interface IKanbanState extends IDataViewControlState {
+  /**
+   * 可拖拽的
+   * @author lxm
+   * @date 2023-08-29 04:18:04
+   * @type {boolean}
+   */
+  draggable: boolean;
+
+  /**
+   * 是否正在更新
+   * @author lxm
+   * @date 2023-09-11 09:09:30
+   * @type {boolean}
+   */
+  updating: boolean;
+
+  /**
+   * 分组界面行为组状态
+   *
+   * @type {(IButtonContainerState)}
+   * @memberof PortletPartState
+   */
+  groupActionGroupState?: IButtonContainerState;
+}

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

@@ -106,4 +106,12 @@ export interface IMDControlGroupState {
    * @memberof IMDControlGroupState
    */
   caption: string;
+
+  /**
+   * 分组唯一标识（分组属性对应的值）
+   * @author lxm
+   * @date 2023-08-30 04:37:05
+   * @type {string}
+   */
+  key: string | number;
 }

package/src/interface/controller/state/control/index.ts

@@ -32,3 +32,4 @@ export * from './i-dashboard.state';
 export * from './i-calendar.state';
 export * from './i-calendar-exp-bar.state';
 export * from './i-context-menu.state';
+export * from './i-kanban.state';

package/src/interface/controller/state/view/i-kanban-view.state.ts

@@ -0,0 +1,10 @@
+import { IMDViewState } from './i-md-view.state';
+
+/**
+ * kanban看板视图UI状态
+ *
+ * @export
+ * @class IKanbanViewState
+ * @extends {IMDViewState}
+ */
+export interface IKanbanViewState extends IMDViewState {}

package/src/interface/controller/state/view/index.ts

@@ -36,4 +36,5 @@ export * from './i-panel-view.state';
 export * from './i-calendar-view.state';
 export * from './i-calendar-exp-view.state';
 export * from './i-pickup-md-view.state';
+export * from './i-kanban-view.state';
 export * from './i-form-pickup-data-view.state';

package/src/service/dto/method.dto.ts

@@ -5,7 +5,6 @@ import {
   IAppDEMethodDTOField,
 } from '@ibiz/model-core';
 import { ModelError } from '@ibiz-template/core';
-import { notNilEmpty } from 'qx-util';
 import { Application } from '../../application';
 import { AppDataEntity } from '../app-data-entity/app-data-entity';
 import { findModelChild } from '../../model';
@@ -58,7 +57,7 @@ export class MethodDto {
           break;
         }
         case 'DTOS': {
-          if (notNilEmpty(data[key])) {
+          if (data[key] !== undefined) {
             break;
           }
           // 没有实体id的不处理

package/src/service/service/entity/method/method.ts

@@ -117,12 +117,14 @@ export abstract class Method {
         case 'GET':
           res = await this.app.net.get(`${path}/${methodName}`, data);
           break;
-        case 'PUT':
+        case 'PUT': {
           res = await this.app.net.put(
             `${path}/${methodName}`,
             notNilEmpty(data) ? data : params,
           );
+          const entity = this.createEntity(data);
           break;
+        }
         case 'DELETE':
           res = await this.app.net.delete(`${path}/${methodName}`, data);
           break;

package/src/service/vo/control.vo.ts

@@ -1,3 +1,4 @@
+import { DataTypes } from '@ibiz-template/core';
 import { clone, isNil } from 'ramda';
 import { Srfuf } from '../constant';
 import { UIMapField } from './ui-map-field';
@@ -141,7 +142,10 @@ export class ControlVO {
     this.$dataUIMap.forEach((mapField, key) => {
       const value = mapField.dataKey;
       // 关联映射属性
-      this.linkProperty(key, value, mapField.isOriginField);
+      const forceNumber =
+        mapField.dataType !== undefined &&
+        DataTypes.isNumber(mapField.dataType);
+      this.linkProperty(key, value, mapField.isOriginField, forceNumber);
     });
 
     // 映射属性里没有涉及到的建立直接关联，用于使用实体属性也要取到值的场景。
@@ -162,15 +166,17 @@ export class ControlVO {
    * @param {string} uiKey 界面字段
    * @param {string} dataKey 数据字段
    * @param {boolean} [isOriginField=true] 是否是后台存储字段，是的话存取都在$origin里
+   * @param {boolean} [forceNumber=false] 是否强制转换成数值，是的话set的时候转成数值
    * @returns {*}
    */
   private linkProperty(
     uiKey: string,
     dataKey: string,
     isOriginField: boolean = true,
+    forceNumber: boolean = false,
   ): void {
     // srfuf和srfkey不做处理
-    if (uiKey === 'srfuf' || uiKey === 'srfkey') {
+    if (uiKey === 'srfuf') {
       return;
     }
 
@@ -183,10 +189,19 @@ export class ControlVO {
         enumerable: true,
         configurable: true,
         get() {
-          return this.$origin[dataKey];
+          // srfkey 视图id优先，拿不到实体属性则拿界面属性(前端id)
+          return uiKey === 'srfkey'
+            ? this.$origin[dataKey] || this.$origin[uiKey]
+            : this.$origin[dataKey];
         },
         set(val) {
-          this.$origin[dataKey] = val;
+          // 非空且强制转数值时，转换值的类型
+          let val2 = forceNumber && !isNil(val) ? Number(val) : val;
+          if (Number.isNaN(val2)) {
+            val2 = val; // NaN时还原值
+            ibiz.log.error(`${val}不能转换成数字`);
+          }
+          this.$origin[dataKey] = val2;
         },
       });
     } else {

package/src/service/vo/ui-map-field.ts

@@ -27,6 +27,14 @@ export class UIMapField {
    */
   dataKey: string;
 
+  /**
+   * 数据类型
+   * @author lxm
+   * @date 2023-09-11 07:30:31
+   * @type {number}
+   */
+  dataType?: number;
+
   /**
    * 是否存储到origin里面(默认false)
    *
@@ -50,6 +58,7 @@ export class UIMapField {
     dataKey: string,
     opts: {
       isOriginField?: boolean;
+      dataType?: number;
     } = {},
   ) {
     this.uiKey = uiKey;
@@ -57,5 +66,8 @@ export class UIMapField {
     if (!isNil(opts.isOriginField)) {
       this.isOriginField = opts.isOriginField;
     }
+    if (!isNil(opts.dataType)) {
+      this.dataType = opts.dataType;
+    }
   }
 }

package/src/ui-logic/ui-logic-link/ui-logic-link-single-cond/ui-logic-link-single-cond.ts

@@ -33,7 +33,7 @@ export class UILogicLinkSingleCond extends UILogicLinkCond {
   readonly dstParam: string;
 
   get dstField(): string {
-    return this.model.dstFieldName!.toLowerCase();
+    return this.model.dstFieldName!;
   }
 
   get op(): string {

package/src/ui-logic/ui-logic-node/append-param-node/append-param-node.ts

@@ -0,0 +1,44 @@
+import { RuntimeModelError } from '@ibiz-template/core';
+import { IDEUIAppendParamLogic } from '@ibiz/model-core';
+import { UILogicContext } from '../../ui-logic-context';
+import { handleSrcVal } from '../../utils';
+import { UILogicNode } from '../ui-logic-node';
+
+/**
+ * 附加到数组参数
+ *
+ * @author lxm
+ * @date 2023-02-09 21:02:20
+ * @export
+ * @class AppendParamNode
+ * @extends {DELogicNode}
+ */
+export class AppendParamNode extends UILogicNode {
+  declare model: IDEUIAppendParamLogic;
+
+  async exec(ctx: UILogicContext): Promise<void> {
+    const {
+      dstDEUILogicParamId,
+      srcDEUILogicParamId,
+      dstIndex,
+      srcIndex,
+      srcSize,
+    } = this.model;
+    if (!dstDEUILogicParamId || !srcDEUILogicParamId) {
+      throw new RuntimeModelError(
+        this.model,
+        '缺少目标参数对象或者源参数对象配置',
+      );
+    }
+    const srcVal = handleSrcVal(ctx, this.model) as IData[];
+    const insertIndex = dstIndex || 0;
+    const _srcIndex = srcIndex || 0;
+    const _srcSize = srcSize || srcVal.length;
+
+    ctx.params[dstDEUILogicParamId].splice(
+      insertIndex,
+      0,
+      ...srcVal.slice(_srcIndex, _srcSize),
+    );
+  }
+}

package/src/ui-logic/ui-logic-node/copy-param-node/copy-param-node.ts

@@ -0,0 +1,31 @@
+import { RuntimeModelError } from '@ibiz-template/core';
+import { IDEUICopyParamLogic } from '@ibiz/model-core';
+import { clone } from 'ramda';
+import { UILogicContext } from '../../ui-logic-context';
+import { handleSrcVal } from '../../utils';
+import { UILogicNode } from '../ui-logic-node';
+
+/**
+ * 拷贝参数
+ *
+ * @author lxm
+ * @date 2023-02-09 21:02:20
+ * @export
+ * @class CopyParamNode
+ * @extends {UILogicNode}
+ */
+export class CopyParamNode extends UILogicNode {
+  declare model: IDEUICopyParamLogic;
+
+  async exec(ctx: UILogicContext): Promise<void> {
+    const { dstDEUILogicParamId, srcDEUILogicParamId } = this.model;
+    if (!dstDEUILogicParamId || !srcDEUILogicParamId) {
+      throw new RuntimeModelError(
+        this.model,
+        '缺少目标参数对象或者源参数对象配置',
+      );
+    }
+    const srcVal = handleSrcVal(ctx, this.model);
+    ctx.params[dstDEUILogicParamId] = clone(srcVal);
+  }
+}

package/src/ui-logic/ui-logic-node/data-set-node/data-set-node.ts

@@ -0,0 +1,37 @@
+import { IDEUIDEDataSetLogic } from '@ibiz/model-core';
+import { UILogicContext } from '../../ui-logic-context';
+import { UILogicNode } from '../ui-logic-node';
+
+/**
+ * 数据集合节点
+ *
+ * @author lxm
+ * @date 2023-02-09 21:02:00
+ * @export
+ * @class DataSetNode
+ * @extends {UILogicNode}
+ */
+export class DataSetNode extends UILogicNode {
+  declare model: IDEUIDEDataSetLogic;
+
+  async exec(ctx: UILogicContext): Promise<void> {
+    const {
+      dstAppDEDataSetId,
+      dstAppDataEntityId,
+      dstDEUILogicParamId,
+      retDEUILogicParamId,
+    } = this.model;
+    const requestData = ctx.params[dstDEUILogicParamId!];
+    const app = ibiz.hub.getApp(ctx.context.srfappid);
+    const res = await app.deService.exec(
+      dstAppDataEntityId!,
+      dstAppDEDataSetId!,
+      ctx.context,
+      requestData,
+      ctx.viewParams,
+    );
+    if (res.ok) {
+      ctx.params[retDEUILogicParamId!] = res.data;
+    }
+  }
+}