@ibiz-template/runtime 0.1.21 → 0.1.23-alpha.0

package/out/ui-logic/ui-logic.js

@@ -1,7 +1,7 @@
 /* eslint-disable no-await-in-loop */
 import { ModelError, RuntimeModelError } from '@ibiz-template/core';
 import { UILogicContext } from './ui-logic-context';
-import { BindParamNode, DEActionNode, DebugParamNode, DEUIActionNode, EndNode, MsgBoxNode, PrepareJSParamNode, StartNode, ViewCtrlInvokeNode, } from './ui-logic-node';
+import { AppendParamNode, BindParamNode, CopyParamNode, DataSetNode, DEActionNode, DebugParamNode, DEUIActionNode, EndNode, ExecuteDELogicNode, MsgBoxNode, PrepareJSParamNode, RenewParamNode, ResetParamNode, SortParamNode, StartNode, ThrowExceptionNode, ViewCtrlFireEventNode, ViewCtrlInvokeNode, } from './ui-logic-node';
 import { UILogicParam } from './ui-logic-param/ui-logic-param';
 /**
  * 界面逻辑
@@ -61,6 +61,12 @@ export class UILogic {
                 case 'PREPAREJSPARAM': // 准备参数
                     logicNode = new PrepareJSParamNode(node);
                     break;
+                case 'RESETPARAM': // 重置参数
+                    logicNode = new ResetParamNode(node);
+                    break;
+                case 'COPYPARAM': // 拷贝参数
+                    logicNode = new CopyParamNode(node);
+                    break;
                 case 'BINDPARAM': // 绑定参数
                     logicNode = new BindParamNode(node);
                     break;
@@ -73,16 +79,28 @@ export class UILogic {
                 case 'DEBUGPARAM': // 调试逻辑参数
                     logicNode = new DebugParamNode(node);
                     break;
-                case 'RESETPARAM': // 重置参数
-                case 'COPYPARAM': // 拷贝参数
-                case 'VIEWCTRLFIREEVENT': // 视图部件事件触发
                 case 'APPENDPARAM': // 附加到数组参数
+                    logicNode = new AppendParamNode(node);
+                    break;
                 case 'SORTPARAM': // 排序数组参数
+                    logicNode = new SortParamNode(node);
+                    break;
                 case 'RENEWPARAM': // 重新建立参数
-                case 'PFPLUGIN': // 前端插件调用
+                    logicNode = new RenewParamNode(node);
+                    break;
                 case 'DEDATASET': // 实体数据集
-                case 'DELOGIC': // 实体逻辑
+                    logicNode = new DataSetNode(node);
+                    break;
                 case 'THROWEXCEPTION': // 抛出异常
+                    logicNode = new ThrowExceptionNode(node);
+                    break;
+                case 'VIEWCTRLFIREEVENT': // 视图部件事件触发
+                    logicNode = new ViewCtrlFireEventNode(node);
+                    break;
+                case 'DELOGIC': // 实体逻辑
+                    logicNode = new ExecuteDELogicNode(node);
+                    break;
+                case 'PFPLUGIN': // 前端插件调用
                 default:
                     throw new ModelError(node, `未支持的逻辑节点类型: ${logicNodeType}`);
             }

package/out/ui-logic/utils/handle-src-val.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"handle-src-val.d.ts","sourceRoot":"","sources":["../../../src/ui-logic/utils/handle-src-val.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,cAAc,EAAE,MAAM,qBAAqB,CAAC;AAErD,KAAK,YAAY,GAAG;IAClB;;OAEG;IACH,YAAY,CAAC,EAAE,MAAM,CAAC;IACtB;;OAEG;IACH,YAAY,CAAC,EAAE,MAAM,CAAC;IACtB;;OAEG;IACH,QAAQ,CAAC,EAAE,MAAM,CAAC;IAClB;;OAEG;IACH,mBAAmB,CAAC,EAAE,MAAM,CAAC;CAC9B,CAAC;AAEF;;;;;;;;GAQG;AACH,wBAAgB,YAAY,CAC1B,GAAG,EAAE,cAAc,EACnB,YAAY,EAAE,YAAY,GACzB,OAAO,CA4CT"}
+{"version":3,"file":"handle-src-val.d.ts","sourceRoot":"","sources":["../../../src/ui-logic/utils/handle-src-val.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,cAAc,EAAE,MAAM,qBAAqB,CAAC;AAErD,KAAK,YAAY,GAAG;IAClB;;OAEG;IACH,YAAY,CAAC,EAAE,MAAM,CAAC;IACtB;;OAEG;IACH,YAAY,CAAC,EAAE,MAAM,CAAC;IACtB;;OAEG;IACH,QAAQ,CAAC,EAAE,MAAM,CAAC;IAClB;;OAEG;IACH,mBAAmB,CAAC,EAAE,MAAM,CAAC;CAC9B,CAAC;AAEF;;;;;;;;GAQG;AACH,wBAAgB,YAAY,CAC1B,GAAG,EAAE,cAAc,EACnB,YAAY,EAAE,YAAY,GACzB,OAAO,CA8CT"}

package/out/ui-logic/utils/handle-src-val.js

@@ -28,12 +28,14 @@ export function handleSrcVal(ctx, srcValParams) {
         // 直接值
         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;
         // 当前环境参数
@@ -44,7 +46,7 @@ export function handleSrcVal(ctx, srcValParams) {
             throw new ModelError(srcValParams, `暂未支持源值类型${srcValueType}`);
     }
     // 取属性值
-    const srcField = srcFieldName === null || srcFieldName === void 0 ? void 0 : srcFieldName.toLowerCase();
+    const srcField = srcFieldName;
     if (value && srcField) {
         // eslint-disable-next-line @typescript-eslint/no-explicit-any
         value = value[srcField];

package/out/utils/verify/de-rule-verify.js

@@ -50,7 +50,7 @@ export function verifyDeRules(name, data, condition) {
         }
     }
     else {
-        name = condition === null || condition === void 0 ? void 0 : condition.defname.toLowerCase();
+        name = (condition === null || condition === void 0 ? void 0 : condition.defname.toLowerCase()) || name;
         try {
             // 常规规则
             if (isSimpleCondition(condition)) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@ibiz-template/runtime",
-  "version": "0.1.21",
+  "version": "0.1.23-alpha.0",
   "description": "控制器包",
   "type": "module",
   "main": "out/index.js",
@@ -29,11 +29,11 @@
   "author": "chitanda",
   "license": "MIT",
   "devDependencies": {
-    "@ibiz-template/core": "^0.1.20",
-    "@ibiz/model-core": "^0.0.15",
+    "@ibiz-template/core": "^0.1.23-alpha.0",
+    "@ibiz/model-core": "^0.0.16",
     "@types/path-browserify": "^1.0.0",
-    "@types/qs": "^6.9.7",
-    "@types/systemjs": "^6.13.1",
+    "@types/qs": "^6.9.8",
+    "@types/systemjs": "^6.13.2",
     "async-validator": "^4.2.5",
     "dayjs": "^1.11.9",
     "echarts": "^5.4.3",
@@ -46,7 +46,7 @@
   },
   "peerDependencies": {
     "@ibiz-template/core": "^0.1.0",
-    "@ibiz/model-core": "^0.0.15",
+    "@ibiz/model-core": "^0.0.16",
     "async-validator": "^4.2.5",
     "dayjs": "^1.11.7",
     "echarts": "^5.4.3",
@@ -57,5 +57,5 @@
     "qx-util": "^0.4.8",
     "ramda": "^0.29.0"
   },
-  "gitHead": "51da056249d0ed3e037db1e6d8a3b646e1ce06b6"
+  "gitHead": "3d456c0b983723282e3c8087aefc17c0af94165f"
 }

package/src/constant/view-call-tag.ts

@@ -11,4 +11,12 @@ export enum ViewCallTag {
    * 视图加载（特指初始化加载）
    */
   'LOAD' = 'Load',
+  /**
+   * 获取数据（多数据指选中数据）
+   */
+  'GET_DATA' = 'GetData',
+  /**
+   * 获取所有数据（多数据专用，获取全部数据）
+   */
+  'GET_ALL_DATA' = 'GetAllData',
 }

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

@@ -4,6 +4,7 @@ import {
   IDEDataViewItem,
   IUIActionGroupDetail,
 } from '@ibiz/model-core';
+import { isNil } from 'ramda';
 import {
   IDataViewControlState,
   IDataViewControlEvent,
@@ -17,12 +18,12 @@ import { MDControlController } from '../../common';
 import { ButtonContainerState, UIActionButtonState } from '../../utils';
 import { DataViewControlService } from './data-view.service';
 
-export class DataViewControlController
-  extends MDControlController<
-    IDEDataView,
-    IDataViewControlState,
-    IDataViewControlEvent
+export class DataViewControlController<
+    T extends IDEDataView = IDEDataView,
+    S extends IDataViewControlState = IDataViewControlState,
+    E extends IDataViewControlEvent = IDataViewControlEvent,
   >
+  extends MDControlController<T, S, E>
   implements IDataViewControlController
 {
   /**
@@ -33,6 +34,14 @@ export class DataViewControlController
    */
   declare service: DataViewControlService;
 
+  /**
+   * 分组代码表项集合
+   * @author lxm
+   * @date 2023-08-29 04:55:07
+   * @type {readonly}
+   */
+  groupCodeListItems?: readonly CodeListItem[];
+
   /**
    * 初始化State
    *
@@ -42,6 +51,7 @@ export class DataViewControlController
   protected initState(): void {
     super.initState();
     this.state.noSort = this.model.noSort === true;
+    this.state.size = this.model.pagingSize || 20;
   }
 
   /**
@@ -53,7 +63,17 @@ export class DataViewControlController
    */
   protected async onCreated(): Promise<void> {
     await super.onCreated();
-    this.state.size = this.model.pagingSize || 20;
+    await this.initControlService();
+  }
+
+  /**
+   * 初始化部件服务
+   * @author lxm
+   * @date 2023-08-29 04:13:05
+   * @protected
+   * @return {*}  {Promise<void>}
+   */
+  protected async initControlService(): Promise<void> {
     this.service = new DataViewControlService(this.model);
     await this.service.init(this.context);
   }
@@ -158,8 +178,11 @@ export class DataViewControlController
    * @memberof DataViewControlController
    */
   async handleDataGroup(): Promise<void> {
-    const { enableGroup, groupMode } = this.model;
+    const { enableGroup, groupMode, groupAppDEFieldId } = this.model;
     if (enableGroup && groupMode) {
+      if (!groupAppDEFieldId) {
+        throw new RuntimeModelError(this.model, '分组属性没有配置');
+      }
       if (groupMode === 'AUTO') {
         this.handleAutoGroup();
       } else if (groupMode === 'CODELIST') {
@@ -177,16 +200,24 @@ export class DataViewControlController
     const { groupAppDEFieldId } = this.model;
     if (groupAppDEFieldId) {
       const { items } = this.state;
-      const childrenMap: Map<string, IData[]> = new Map();
+      const groupMap: Map<string, IData[]> = new Map();
       items.forEach((item: IData) => {
-        const children = childrenMap.get(item[groupAppDEFieldId]) || [];
-        children.push(item);
-        childrenMap.set(item[groupAppDEFieldId], children);
+        const groupVal = item[groupAppDEFieldId];
+        if (isNil(groupVal)) {
+          // 分组无值的不显示
+          return;
+        }
+
+        if (!groupMap.has(groupVal)) {
+          groupMap.set(groupVal, []);
+        }
+        groupMap.get(groupVal)!.push(item);
       });
       const groups: IMDControlGroupState[] = [];
-      childrenMap.forEach((value: IData[], key: string) => {
+      groupMap.forEach((value: IData[], key: string) => {
         groups.push({
           caption: key,
+          key,
           children: [...value],
         });
       });
@@ -194,44 +225,63 @@ export class DataViewControlController
     }
   }
 
+  /**
+   * 加载并初始化分组代码表项集合
+   * @author lxm
+   * @date 2023-08-29 05:11:39
+   * @protected
+   * @return {*}  {Promise<void>}
+   */
+  protected async initGroupCodeListItems(): Promise<void> {
+    const { groupCodeListId } = this.model;
+    if (!groupCodeListId) {
+      throw new RuntimeModelError(this.model, '分组代码表没有配置');
+    }
+    const app = ibiz.hub.getApp(this.context.srfappid);
+    this.groupCodeListItems = await app.codeList.get(
+      groupCodeListId,
+      this.context,
+      this.params,
+    );
+  }
+
   /**
    * 处理代码表分组
    *
    * @memberof DataViewControlController
    */
   async handleCodeListGroup(): Promise<void> {
-    const { groupAppDEFieldId, groupCodeListId } = this.model;
-    if (groupAppDEFieldId && groupCodeListId) {
-      const { items } = this.state;
-      const groups: IMDControlGroupState[] = [];
-      const app = ibiz.hub.getApp(this.context.srfappid);
-      const codeList = await app.codeList.get(
-        groupCodeListId,
-        this.context,
-        this.params,
-      );
-      const keys: string[] = [];
-      codeList.forEach((codeListItem: CodeListItem) => {
-        const value = items.filter(
-          (item: IData) => item[groupAppDEFieldId] === codeListItem.value,
-        );
-        groups.push({
-          caption: codeListItem.text,
-          children: [...value],
-        });
-        keys.push(codeListItem.value as string);
-      });
-      const otherGroup = items.filter(
-        (item: IData) => keys.indexOf(item[groupAppDEFieldId]) === -1,
-      );
-      if (otherGroup.length > 0) {
-        groups.push({
-          caption: '其他',
-          children: [...otherGroup],
-        });
-      }
-      this.state.groups = groups;
+    const { groupAppDEFieldId } = this.model;
+    if (!this.groupCodeListItems) {
+      await this.initGroupCodeListItems();
     }
+    const { items } = this.state;
+    const groupMap: Map<string | number, IData[]> = new Map();
+    this.groupCodeListItems!.forEach(item => {
+      groupMap.set(item.value, []);
+    });
+    items.forEach((item: IData) => {
+      const groupVal = item[groupAppDEFieldId!];
+      const groupArr = groupMap.get(groupVal);
+      if (groupArr) {
+        groupArr.push(item);
+      }
+      // 不在代码表里数据忽略
+    });
+
+    const groups: IMDControlGroupState[] = [];
+    groupMap.forEach((arr, key) => {
+      // 标题
+      const codeListItem = this.groupCodeListItems!.find(
+        item => item.value === key,
+      )!;
+      groups.push({
+        caption: codeListItem.text,
+        key: codeListItem.value,
+        children: arr,
+      });
+    });
+    this.state.groups = groups;
   }
 
   /**

package/src/controller/control/data-view/data-view.service.ts

@@ -8,7 +8,9 @@ import { MDControlService, UIMapField } from '../../../service';
  * @class DataViewControlService
  * @extends {MDControlService<IDEDataView>}
  */
-export class DataViewControlService extends MDControlService<IDEDataView> {
+export class DataViewControlService<
+  T extends IDEDataView = IDEDataView,
+> extends MDControlService<T> {
   /**
    * 初始化属性映射
    *
@@ -16,7 +18,7 @@ export class DataViewControlService extends MDControlService<IDEDataView> {
    */
   initUIDataMap(): void {
     super.initUIDataMap();
-    // *初始化表格数据项的属性映射
+    // *初始化数据项的属性映射
     this.model.dedataViewDataItems?.forEach(item => {
       const uiKey = item.id!.toLowerCase();
       const deField = item.appDEFieldId;
@@ -26,6 +28,7 @@ export class DataViewControlService extends MDControlService<IDEDataView> {
         const deFieldKey = deField.toLowerCase();
         mapField = new UIMapField(uiKey, deFieldKey, {
           isOriginField: true,
+          dataType: item.dataType,
         });
       } else {
         // 前台属性

package/src/controller/control/form/edit-form/edit-form.service.ts

@@ -273,6 +273,7 @@ export class EditFormService<
           if (deField) {
             mapField = new UIMapField(uiKey, deField, {
               isOriginField: true,
+              dataType: formItem.dataType,
             });
           } else {
             // 前台属性和没属性的表单项，或预置属性

package/src/controller/control/form/form-detail/form-druipart/form-druipart.controller.ts

@@ -1,7 +1,7 @@
 import { isOverlap } from '@ibiz-template/core';
 import { IDEFormDRUIPart } from '@ibiz/model-core';
 import { createUUID, notNilEmpty } from 'qx-util';
-import { SysUIActionTag } from '../../../../../constant';
+import { SysUIActionTag, ViewCallTag } from '../../../../../constant';
 import { IViewController } from '../../../../../interface';
 import { convertNavData } from '../../../../../utils';
 import { FormNotifyState } from '../../../../constant';
@@ -117,9 +117,14 @@ export class FormDRUIPartController extends FormDetailController<IDEFormDRUIPart
     await super.formStateNotify(state);
 
     this.isNewData = state === FormNotifyState.DRAFT;
-    this.state.showMask = this.isNewData;
-
-    if (state === FormNotifyState.LOAD || state === FormNotifyState.DRAFT) {
+    if (this.model.maskMode !== 0) {
+      this.state.showMask = this.isNewData;
+    }
+    if (
+      state === FormNotifyState.LOAD ||
+      state === FormNotifyState.DRAFT ||
+      state === FormNotifyState.SAVE
+    ) {
       // 表单数据加载变更后，计算关系界面参数
       this.calcViewParams();
     }
@@ -190,7 +195,7 @@ export class FormDRUIPartController extends FormDetailController<IDEFormDRUIPart
     this.embedView = view;
     this.embedView.evt.on('onMounted', () => {
       if (!this.isNewData) {
-        this.embedView.callUIAction(SysUIActionTag.REFRESH);
+        this.embedView.call(ViewCallTag.LOAD);
       }
     });
     this.embedView.evt.on('onDataChange', event => {

package/src/controller/control/grid/grid/grid.controller.ts

@@ -328,6 +328,7 @@ export class GridController
         );
         this.state.groups.push({
           caption: codeListItem?.text || `${key}`,
+          key,
           children: value,
         });
       });
@@ -510,7 +511,6 @@ export class GridController
     rowState.data = res.data;
     rowState.modified = false;
 
-    ibiz.message.success(`${res.data.srfmajortext || ''}保存成功`);
     this.actionNotification(`${isCreate ? 'CREATE' : 'UPDATE'}SUCCESS`, {
       default: `${res.data.srfmajortext || ''}保存成功`,
       data: res.data,

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

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

package/src/controller/control/index.ts

@@ -18,3 +18,4 @@ export * from './toolbar/index';
 export * from './tree/index';
 export * from './wizard-panel/index';
 export * from './md-ctrl/index';
+export * from './kanban/index';

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

@@ -0,0 +1,2 @@
+export * from './kanban.controller';
+export * from './kanban.service';