@ibiz-template/runtime 0.1.26 → 0.1.28

package/src/controller/control/panel/panel/panel-item.controller.ts

@@ -133,10 +133,15 @@ export class PanelItemController<T extends IPanelItem = IPanelItem>
    * @date 2022-09-20 18:09:56
    * @param {string[]} names
    */
-  dataChangeNotify(names: string[]): void {
+  async dataChangeNotify(names: string[]): Promise<void> {
     // 计算动态控制逻辑
     this.calcDynamicLogic(names);
 
+    // 计算显示，禁用，必填状态
+    this.calcItemDisabled(this.data);
+    this.calcItemVisible(this.data);
+    this.calcItemRequired(this.data);
+
     // 计算动态样式表
     this.calcDynaClass(this.data);
   }
@@ -147,14 +152,109 @@ export class PanelItemController<T extends IPanelItem = IPanelItem>
    * @author lxm
    * @date 2022-09-20 18:09:07
    */
-  panelStateNotify(_state: PanelNotifyState): void {
+  async panelStateNotify(_state: PanelNotifyState): Promise<void> {
     // 计算动态控制逻辑
     this.calcDynamicLogic([], true);
 
+    // 计算显示，禁用，必填状态
+    this.calcItemDisabled(this.data);
+    this.calcItemVisible(this.data);
+    this.calcItemRequired(this.data);
+
     // 计算动态样式表
     this.calcDynaClass(this.data);
   }
 
+  /**
+   * 计算项的禁用状态
+   * @author lxm
+   * @date 2023-06-26 06:19:00
+   * @param {IData} data
+   */
+  calcItemDisabled(data: IData): void {
+    let enable = !this.dynaLogicResult.disabled;
+
+    // 上层计算为启用时计算预定义项启用逻辑
+    if (enable && this.panel.scheduler) {
+      const itemEnable = this.panel.scheduler.triggerItemEnable(
+        this.model.id!,
+        {
+          data: [data],
+        },
+      );
+      if (itemEnable !== undefined) {
+        enable = itemEnable;
+      }
+    }
+
+    // 修改state
+    this.state.disabled = !enable;
+  }
+
+  /**
+   * 计算项的显示状态
+   * @author lxm
+   * @date 2023-06-26 06:19:00
+   * @param {IData} data
+   */
+  calcItemVisible(data: IData): void {
+    let { visible } = this.dynaLogicResult;
+
+    // 上层计算为显示时计算预定义项显示逻辑
+    if (visible && this.panel.scheduler) {
+      const itemVIsible = this.panel.scheduler.triggerItemVisible(
+        this.model.id!,
+        {
+          data: [data],
+        },
+      );
+      if (itemVIsible !== undefined) {
+        visible = itemVIsible;
+      }
+    }
+
+    // 修改state
+    this.state.visible = visible;
+  }
+
+  /**
+   * 计算项的必填状态
+   * @author lxm
+   * @date 2023-06-26 06:19:00
+   * @param {IData} data
+   */
+  calcItemRequired(data: IData): void {
+    let allowEmpty = !this.dynaLogicResult.required;
+
+    // 上层计算为启用时计算预定义项启用逻辑
+    if (allowEmpty && this.panel.scheduler) {
+      const itemAllowEmpty = this.panel.scheduler.triggerItemBlank(
+        this.model.id!,
+        {
+          data: [data],
+        },
+      );
+      if (itemAllowEmpty !== undefined) {
+        allowEmpty = itemAllowEmpty;
+      }
+    }
+
+    // 修改state
+    this.state.required = !allowEmpty;
+  }
+
+  /**
+   * 动态逻辑结果
+   * @author lxm
+   * @date 2023-09-21 03:36:37
+   * @protected
+   */
+  protected dynaLogicResult = {
+    visible: true,
+    disabled: false,
+    required: false,
+  };
+
   /**
    * 计算动态逻辑
    *
@@ -182,15 +282,15 @@ export class PanelItemController<T extends IPanelItem = IPanelItem>
           switch (logic.logicCat) {
             // 动态空输入，不满足则必填
             case 'ITEMBLANK':
-              this.state.required = !ok;
+              this.dynaLogicResult.required = !ok;
               break;
             // 动态启用，满足则启用
             case 'ITEMENABLE':
-              this.state.disabled = !ok;
+              this.dynaLogicResult.disabled = !ok;
               break;
             // 动态显示，满足则显示
             case 'PANELVISIBLE':
-              this.state.visible = ok;
+              this.dynaLogicResult.visible = ok;
               break;
             default:
           }

package/src/controller/control/panel/panel/panel.controller.ts

@@ -1,6 +1,7 @@
 /* eslint-disable no-param-reassign */
-import { RuntimeError } from '@ibiz-template/core';
+import { recursiveIterate, RuntimeError } from '@ibiz-template/core';
 import {
+  IControlLogic,
   IPanel,
   IPanelContainer,
   IPanelItem,
@@ -268,4 +269,19 @@ export class PanelController<
     this.state.data[name] = value;
     this.dataChangeNotify([name]);
   }
+
+  protected initControlScheduler(logics: IControlLogic[] = []): void {
+    const actualLogics = [...logics];
+    // 遍历所有的项，如果有逻辑的话加入
+    recursiveIterate(
+      this.model,
+      (item: IPanelItem) => {
+        if (item.controlLogics) {
+          actualLogics.push(...item.controlLogics);
+        }
+      },
+      { childrenFields: ['rootPanelItems', 'panelItems', 'panelTabPages'] },
+    );
+    super.initControlScheduler(actualLogics);
+  }
 }

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/control/toolbar/toolbar.controllerr.ts

@@ -1,4 +1,4 @@
-import { recursiveIterate } from '@ibiz-template/core';
+import { recursiveIterate, RuntimeError } from '@ibiz-template/core';
 import {
   IDEToolbar,
   IDEToolbarItem,
@@ -13,6 +13,7 @@ import {
   IExtraButton,
   IButtonState,
 } from '../../../interface';
+import { getUIActionById } from '../../../model';
 import { ControlVO } from '../../../service';
 import { UIActionUtil } from '../../../ui-action';
 import { ControlController } from '../../common';
@@ -69,15 +70,35 @@ export class ToolbarController<
     // 执行界面行为
     if (item.itemType === 'DEUIACTION') {
       const actionId = (item as IDETBUIActionItem).uiactionId;
-      const res = await this.ctx.view.call(ViewCallTag.GET_DATA);
-      const data = res || [];
-      const args = this.getEventArgs();
-      args.params = Object.assign(param, args.params);
-      await UIActionUtil.execAndResolved(actionId!, {
-        ...args,
-        data,
-        event,
-      });
+      const uiAction = await getUIActionById(actionId!);
+      if (!uiAction) {
+        throw new RuntimeError(`没有找到界面行为模型${actionId}`);
+      }
+
+      // 是否过程中启用loading
+      const enableLoading =
+        ['SYS', 'BACKEND', 'WFBACKEND'].includes(uiAction.uiactionMode!) &&
+        uiAction.showBusyIndicator !== false;
+
+      if (enableLoading) {
+        this.state.buttonsState.setLoading(item.id!);
+      }
+
+      try {
+        const res = await this.ctx.view.call(ViewCallTag.GET_DATA);
+        const data = res || [];
+        const args = this.getEventArgs();
+        args.params = Object.assign(param, args.params);
+        await UIActionUtil.execAndResolved(actionId!, {
+          ...args,
+          data,
+          event,
+        });
+      } finally {
+        if (enableLoading) {
+          this.state.buttonsState.setLoading('');
+        }
+      }
     }
   }
 
@@ -122,21 +143,16 @@ export class ToolbarController<
     event: MouseEvent,
     params?: IData,
   ): Promise<void> {
-    this.state.buttonsState.setLoading(item.id!);
     const isExtra = (item as IExtraButton).buttonType === 'extra';
-    try {
-      await this._evt.emit('onClick', {
-        event,
-        eventArg: item.id!,
-        buttonType: isExtra ? 'extra' : 'deuiaction',
-      });
-
-      // 工具栏才走界面行为
-      if (!isExtra) {
-        await this.doUIAction(item, event, params);
-      }
-    } finally {
-      this.state.buttonsState.setLoading('');
+    await this._evt.emit('onClick', {
+      event,
+      eventArg: item.id!,
+      buttonType: isExtra ? 'extra' : 'deuiaction',
+    });
+
+    // 工具栏才走界面行为
+    if (!isExtra) {
+      await this.doUIAction(item, event, params);
     }
   }
 

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/controller/control/panel-item/i-panel-item.controller.ts

@@ -43,7 +43,7 @@ export interface IPanelItemController {
    * @date 2022-09-20 18:09:56
    * @param {string[]} names
    */
-  dataChangeNotify(names: string[]): void;
+  dataChangeNotify(names: string[]): Promise<void>;
 
   /**
    * 面板状态变更通知
@@ -51,5 +51,5 @@ export interface IPanelItemController {
    * @author lxm
    * @date 2022-09-20 18:09:07
    */
-  panelStateNotify(_state: PanelNotifyState): void;
+  panelStateNotify(state: PanelNotifyState): 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/logic-scheduler/trigger/item-dyna-logic-trigger.ts

@@ -39,7 +39,11 @@ export class ItemDynaLogicTrigger extends LogicTrigger {
 
   match(matchParams: ITriggerMatchParams): boolean {
     const superResult = super.match(matchParams);
-    return superResult && matchParams.itemName === this.logic.itemName;
+    return (
+      superResult &&
+      // 忽略大小写匹配
+      matchParams.itemName?.toLowerCase() === this.logic.itemName?.toLowerCase()
+    );
   }
 
   execute(executeParams: IUILogicParams): boolean {

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/service/service/entity/method/method.ts

@@ -115,7 +115,7 @@ export abstract class Method {
           );
           break;
         case 'GET':
-          res = await this.app.net.get(`${path}/${methodName}`, data);
+          res = await this.app.net.get(`${path}/${methodName}`, data || params);
           break;
         case 'PUT': {
           res = await this.app.net.put(
@@ -125,7 +125,10 @@ export abstract class Method {
           break;
         }
         case 'DELETE':
-          res = await this.app.net.delete(`${path}/${methodName}`, data);
+          res = await this.app.net.delete(
+            `${path}/${methodName}`,
+            data || params,
+          );
           break;
         default:
           if (requestMethod) {

package/src/service/utils/dynamic-code-list/dynamic-code-list.ts

@@ -158,11 +158,11 @@ export class DynamicCodeListCache {
   ): Promise<CodeListItem[]> {
     const app = ibiz.hub.getApp(context.srfappid);
     // *预定义加载
+    // 特殊处理，避免预置代码表加载不全
+    if (!params.size) {
+      params = { ...params, size: 10000 };
+    }
     if (this.isPredefined) {
-      // 特殊处理，避免预置代码表加载不全
-      if (!params.size) {
-        params = { ...params, size: 10000 };
-      }
       const res = await app.net.get(
         `/dictionaries/codelist/${this.codeList.codeName}`,
         params,