@ibiz-template/runtime 0.1.26 → 0.1.27

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

@@ -1,5 +1,5 @@
 import { RuntimeError, RuntimeModelError } from '@ibiz-template/core';
-import { IDEKanban, IUIActionGroupDetail } from '@ibiz/model-core';
+import { IDEKanban } from '@ibiz/model-core';
 import { isNil } from 'ramda';
 import {
   IDragChangeInfo,
@@ -10,8 +10,6 @@ import {
 } from '../../../interface';
 import { calcDeCodeNameById } from '../../../model';
 import { ControlVO } from '../../../service';
-import { UIActionUtil } from '../../../ui-action';
-import { ButtonContainerState, UIActionButtonState } from '../../utils';
 import { DataViewControlController } from '../data-view';
 import { KanbanService } from './kanban.service';
 
@@ -49,17 +47,6 @@ export class KanbanController
     return this.model.enableCardEditGroup === true;
   }
 
-  /**
-   * 是否允许新建
-   * @author lxm
-   * @date 2023-09-11 04:05:25
-   * @readonly
-   * @type {boolean}
-   */
-  get enableNew(): boolean {
-    return this.model.enableCardNew === true;
-  }
-
   protected async initControlService(): Promise<void> {
     this.service = new KanbanService(this.model);
     await this.service.init(this.context);
@@ -82,48 +69,6 @@ export class KanbanController
    */
   protected async onCreated(): Promise<void> {
     await super.onCreated();
-    await this.initGroupActionStates();
-  }
-
-  /**
-   * 初始化分组右侧界面行为按钮的状态
-   *
-   * @author chitanda
-   * @date 2023-08-02 17:08:04
-   * @return {*}  {Promise<void>}
-   */
-  async initGroupActionStates(): Promise<void> {
-    const { groupUIActionGroup } = this.model;
-    if (!groupUIActionGroup?.uiactionGroupDetails?.length) {
-      return;
-    }
-    const containerState = new ButtonContainerState();
-    groupUIActionGroup.uiactionGroupDetails.forEach(detail => {
-      const actionid = detail.uiactionId;
-      if (actionid) {
-        const buttonState = new UIActionButtonState(
-          detail.id!,
-          this.context.srfappid!,
-          actionid,
-        );
-        containerState.addState(detail.id!, buttonState);
-      }
-    });
-    await containerState.update();
-    this.state.groupActionGroupState = containerState;
-
-    this.evt.on('onSelectionChange', event => {
-      let data = event.data[0];
-      if (data && data instanceof ControlVO) {
-        data = data.getOrigin();
-      }
-      if (data) {
-        this.state.groupActionGroupState!.update(
-          data,
-          this.model.appDataEntityId!,
-        );
-      }
-    });
   }
 
   /**
@@ -325,46 +270,4 @@ export class KanbanController
       await this.afterLoad({}, this.state.items);
     }
   }
-
-  /**
-   * 点击新建
-   * @author lxm
-   * @date 2023-09-11 07:22:33
-   * @param {MouseEvent} event
-   * @param {(string | number)} group 分组标识
-   */
-  onClickNew(event: MouseEvent, group: string | number): void {
-    const params = { ...this.params, srfgroup: group };
-    UIActionUtil.execAndResolved('new', {
-      context: this.context,
-      params,
-      data: [],
-      view: this.view,
-      event,
-    });
-  }
-
-  /**
-   * 分组工具栏点击处理回调
-   * @author lxm
-   * @date 2023-09-11 04:48:06
-   * @param {IUIActionGroupDetail} detail
-   * @param {MouseEvent} event
-   * @return {*}  {Promise<void>}
-   */
-  async onGroupToolbarClick(
-    detail: IUIActionGroupDetail,
-    event: MouseEvent,
-    group: string | number,
-  ): Promise<void> {
-    const actionId = detail.uiactionId;
-    const params = { ...this.params, srfgroup: group };
-    await UIActionUtil.execAndResolved(actionId!, {
-      context: this.context,
-      params,
-      data: this.state.selectedData,
-      view: this.view,
-      event,
-    });
-  }
 }

package/src/controller/control/tab-exp-panel/tab-exp-panel.controller.ts

@@ -22,6 +22,22 @@ export class TabExpPanelController
   extends ControlController<ITabExpPanel, ITabExpPanelState, ITabExpPanelEvent>
   implements ITabExpPanelController
 {
+  /**
+   * 是否显示文本
+   * @return {*}
+   * @author: zhujiamin
+   * @Date: 2023-09-20 10:36:35
+   */
+  isShowCaption = true;
+
+  /**
+   * 是否显示图标
+   * @return {*}
+   * @author: zhujiamin
+   * @Date: 2023-09-20 10:36:46
+   */
+  isShowIcon = false;
+
   /**
    * 初始化state的属性
    *
@@ -46,6 +62,7 @@ export class TabExpPanelController
     this.layoutPanel = this.view.layoutPanel!;
 
     this.initTabPages();
+    this.initIconCaption();
   }
 
   /**
@@ -61,6 +78,7 @@ export class TabExpPanelController
         caption: panel.caption!,
         tabTag: panel.id!,
         class: panel.sysCss ? [panel.sysCss.cssName!] : [],
+        sysImage: panel.sysImage,
       });
     });
     this.state.tabPages = tabPages;
@@ -69,6 +87,33 @@ export class TabExpPanelController
     }
   }
 
+  /**
+   * 初始化图标和文本显示
+   *
+   * @memberof TabExpPanelController
+   */
+  initIconCaption(): void {
+    // 临时处理，视图参数那边配置showMode决定显示
+    if (this.params.showmode) {
+      switch (this.params.showmode) {
+        case 'ICONANDSHORTWORD':
+          this.isShowIcon = true;
+          this.isShowCaption = true;
+          break;
+        case 'ICON':
+          this.isShowIcon = true;
+          this.isShowCaption = false;
+          break;
+        case 'SHORTWORD':
+          this.isShowIcon = false;
+          this.isShowCaption = true;
+          break;
+        default:
+          break;
+      }
+    }
+  }
+
   /**
    * 初始化默认分页
    *

package/src/controller/utils/index.ts

@@ -5,3 +5,4 @@ export * from './event';
 export * from './util/util';
 export * from './value-rule/value-rule';
 export * from './value-ex/value-ex';
+export * from './value-default/value-default';

package/src/controller/utils/value-default/value-default.ts

@@ -0,0 +1,110 @@
+import { RuntimeError, ModelError } from '@ibiz-template/core';
+import dayjs from 'dayjs';
+import { createUUID } from 'qx-util';
+import { isNil, isNotNil } from 'ramda';
+
+export type DefaultValueOrigins = {
+  data: IData;
+  context: IParams;
+  params: IParams;
+};
+
+export type DefaultValueOpts = {
+  /**
+   * 属性名称
+   * @author lxm
+   * @date 2023-09-18 03:47:18
+   * @type {string}
+   */
+  name: string;
+  /**
+   * 默认值类型
+   * @author lxm
+   * @date 2023-09-18 03:47:24
+   * @type {string}
+   */
+  valueType?: string;
+  /**
+   * 默认值
+   * @author lxm
+   * @date 2023-09-18 03:47:31
+   * @type {string}
+   */
+  defaultValue?: string;
+  /**
+   * 值格式化
+   * @author lxm
+   * @date 2023-09-18 03:47:36
+   * @type {string}
+   */
+  valueFormat?: string;
+};
+
+export function getDefaultValue(
+  opts: DefaultValueOpts,
+  origins: DefaultValueOrigins,
+): unknown {
+  const { name, valueType, defaultValue, valueFormat } = opts;
+  const { data, context, params } = origins;
+
+  // 没有配置默认值,不处理返回undefined
+  if (isNil(valueType) && isNil(defaultValue)) {
+    return;
+  }
+
+  // 类型为置空的时候
+  if (valueType === 'RESET') {
+    return null;
+  }
+
+  const value = data[name];
+  // 除置空之外的默认值类型，有值的时候不处理返回undefined
+  if (isNotNil(value)) {
+    return;
+  }
+
+  // 没有配类型，配了默认值的直接赋值默认值
+  if (!valueType && defaultValue) {
+    return defaultValue;
+  }
+
+  switch (valueType) {
+    // 当前应用数据，优先取视图参数，视图参数没有取上下文
+    case 'APPDATA':
+      if (Object.prototype.hasOwnProperty.call(params, defaultValue!)) {
+        return params[defaultValue!];
+      }
+      if (Object.prototype.hasOwnProperty.call(context, defaultValue!)) {
+        return context[defaultValue!];
+      }
+      break;
+    // 当前操作用户(名称)
+    case 'OPERATORNAME':
+      return context.srfusername;
+    // 当前操作用户(编号)
+    case 'OPERATOR':
+      return context.srfuserid;
+    // 当前时间
+    case 'CURTIME':
+      return dayjs().format(valueFormat);
+    // 数据对象属性
+    case 'PARAM':
+      return data[defaultValue!];
+    case 'SESSION': // 用户全局对象
+    case 'APPLICATION': // 系统全局对象
+      // 取appData里的上下文
+      if (!ibiz.appData?.context) {
+        throw new RuntimeError('appdata.context不存在');
+      }
+      return ibiz.appData.context[defaultValue!];
+    // 网页请求用视图参数
+    case 'CONTEXT':
+      return params[defaultValue!];
+    // 唯一编码
+    case 'UNIQUEID':
+      return createUUID();
+    default:
+      // 未支持类型
+      throw new ModelError({}, `默认值类型[${valueType}]未支持`);
+  }
+}

package/src/de-logic/de-logic-node/end-node/end-node.ts

@@ -18,6 +18,12 @@ export class EndNode extends DELogicNode {
   async exec(ctx: DELogicContext): Promise<void> {
     ctx.isEndNode = true;
     const { returnParamId, returnType, rawValue } = this.model;
+
+    // 没配置不做处理
+    if (!returnType) {
+      return;
+    }
+
     switch (returnType) {
       case 'NONEVALUE': // 无值（NONE）
         ctx.result = undefined;

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

@@ -78,6 +78,14 @@ export class MDViewEngine extends ViewEngineBase {
     await super.onCreated();
     const { childNames } = this.view;
     childNames.push(this.xdataControlName!, 'searchform', 'searchbar');
+
+    // 存在xdataControlName名称时就是普通多数据视图，给对应的多数据部件传递noLoadDefault
+    if (this.xdataControlName) {
+      if (!this.view.slotProps[this.xdataControlName]) {
+        this.view.slotProps[this.xdataControlName] = {};
+      }
+      this.view.slotProps[this.xdataControlName].loadDefault = false;
+    }
   }
 
   async onMounted(): Promise<void> {

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

@@ -17,4 +17,12 @@ export interface IControlState extends IControllerState {
    * @type {boolean}
    */
   isLoading: boolean;
+
+  /**
+   * 默认加载
+   * @author lxm
+   * @date 2023-07-28 04:29:49
+   * @type {boolean}
+   */
+  loadDefault: boolean;
 }

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

@@ -1,3 +1,4 @@
+import { IButtonContainerState } from '../../common';
 import { IMDControlState } from './i-md-control.state';
 
 /**
@@ -7,4 +8,12 @@ import { IMDControlState } from './i-md-control.state';
  * @interface IDataViewControlState
  * @extends {IMDControlState}
  */
-export interface IDataViewControlState extends IMDControlState {}
+export interface IDataViewControlState extends IMDControlState {
+  /**
+   * 分组界面行为组状态
+   *
+   * @type {(IButtonContainerState)}
+   * @memberof PortletPartState
+   */
+  groupActionGroupState?: IButtonContainerState;
+}

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

@@ -115,6 +115,14 @@ export interface IGridRowState {
    * @memberof GridRowState
    */
   processing: boolean;
+
+  /**
+   * 缓存的数据对象
+   * @author lxm
+   * @date 2023-09-18 05:11:32
+   * @type {IData}
+   */
+  cacheData?: ControlVO;
 }
 
 /**

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

@@ -1,4 +1,3 @@
-import { IButtonContainerState } from '../../common';
 import { IDataViewControlState } from './i-data-view-control.state';
 
 /**
@@ -24,12 +23,4 @@ export interface IKanbanState extends IDataViewControlState {
    * @type {boolean}
    */
   updating: boolean;
-
-  /**
-   * 分组界面行为组状态
-   *
-   * @type {(IButtonContainerState)}
-   * @memberof PortletPartState
-   */
-  groupActionGroupState?: IButtonContainerState;
 }

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

@@ -1,3 +1,4 @@
+import { IButtonContainerState } from '../../common';
 import { IControlState } from './i-control.state';
 
 export interface IMDControlState extends IControlState {
@@ -114,4 +115,19 @@ export interface IMDControlGroupState {
    * @type {string}
    */
   key: string | number;
+
+  /**
+   * 分组界面行为组状态
+   *
+   * @type {(IButtonContainerState)}
+   * @memberof IMDControlGroupState
+   */
+  groupActionGroupState?: IButtonContainerState;
+
+  /**
+   * 当前分组已选中的数据集合
+   *
+   * @type {IData[]}
+   */
+  selectedData?: IData[];
 }

package/src/interface/controller/state/control/i-tab-exp-panel.state.ts

@@ -1,3 +1,4 @@
+import { ISysImage } from '@ibiz/model-core';
 import { IControlState } from './i-control.state';
 
 /**
@@ -72,4 +73,12 @@ export interface ITabExpPanelPagesState {
    * @type {string[]}
    */
   class: string[];
+
+  /**
+   * 标题图标
+   * @author lxm
+   * @date 2023-07-25 02:51:28
+   * @type {string[]}
+   */
+  sysImage?: ISysImage;
 }

package/src/model/layout/layout.ts

@@ -1,4 +1,5 @@
 import { IGridLayoutPos, ILayoutPos } from '@ibiz/model-core';
+import { isArray, isObject, isString } from 'lodash-es';
 import type { GridLayoutAttrs, ScreenSize } from '../../interface';
 import { ScriptFactory } from '../../utils';
 
@@ -145,8 +146,21 @@ export function calcGridLayoutPos(
  * @return {*}  {string[]}
  */
 export function calcDynaClass(expression: string, data: IData): string[] {
-  return ScriptFactory.execScriptFn({ data }, expression, {
+  const classArr: string[] = [];
+  const result = ScriptFactory.execScriptFn({ data }, expression, {
     singleRowReturn: true,
     isAsync: false,
-  }) as string[];
+  });
+  if (isString(result)) {
+    classArr.push(result);
+  } else if (isArray(result)) {
+    classArr.push(...result);
+  } else if (isObject(result)) {
+    Object.keys(result).forEach(key => {
+      if ((result as IData)[key]) {
+        classArr.push(key);
+      }
+    });
+  }
+  return classArr;
 }

package/src/ui-logic/ui-logic-node/end-node/end-node.ts

@@ -18,6 +18,12 @@ export class EndNode extends UILogicNode {
   async exec(ctx: UILogicContext): Promise<void> {
     ctx.isEndNode = true;
     const { returnType, rawValue, returnParamId } = this.model;
+
+    // 没配置不做处理
+    if (!returnType) {
+      return;
+    }
+
     switch (returnType) {
       case 'NONEVALUE': // 无值（NONE）
         ctx.result = undefined;