@ibiz-template/runtime 0.1.23 → 0.1.25

package/src/controller/control/exp-bar/exp-bar.controller.ts

@@ -256,15 +256,28 @@ export class ExpBarControlController<
     const selectItem = this.xDataController?.state.items.find(
       item => item[this.navKeyName] === this.state.srfnav,
     );
-    if (selectItem) {
-      // 在多数据部件里面选项设置回显。
+
+    // 是否是路由模式且有子路由
+    const routeAndHasSub =
+      this.routeDepth &&
+      window.location.hash.split('/').length > this.routeDepth * 2 + 2;
+    console.log('routeAndHasSub', routeAndHasSub);
+
+    if (routeAndHasSub) {
+      if (selectItem) {
+        // 在多数据部件里面选项设置回显。
+        this.xDataController.setSelection([selectItem]);
+      }
+      // 此时不需要导航占位push路由，只要有个key触发绘制下级视图就行。
+      this._evt.emit('onNavViewChange', {
+        navViewMsg: { key: this.state.srfnav },
+        context: this.context,
+      });
+    } else if (selectItem) {
+      // 非路由模式,或者有路由模式下有srfnav没有子路由时，需要在多数据部件里面选项设置回显。
+      this.xDataController.setActive(selectItem);
       this.xDataController.setSelection([selectItem]);
     }
-    // 此时不需要导航占位push路由，只要有个key触发绘制下级视图就行。
-    this._evt.emit('onNavViewChange', {
-      navViewMsg: { key: this.state.srfnav },
-      context: this.context,
-    });
   }
 
   /**
@@ -279,6 +292,7 @@ export class ExpBarControlController<
     const data = this.xDataController.state.items[0];
     if (!data) {
       // 导航视图传空让他导航占位绘制空界面
+      this.state.srfnav = '';
       this._evt.emit('onNavViewChange', { navViewMsg: { key: '' } });
       return;
     }
@@ -340,6 +354,7 @@ export class ExpBarControlController<
     const tempContext = Object.assign(context.clone(), resultContext, {
       currentSrfNav: data[this.navKeyName],
     });
+    this.state.srfnav = data[this.navKeyName];
     const tempParams = { ...resultParams };
     return { context: tempContext, params: tempParams };
   }
@@ -420,4 +435,17 @@ export class ExpBarControlController<
       }
     });
   }
+
+  /**
+   * 路由变更处理回调
+   * @author lxm
+   * @date 2023-09-14 07:03:39
+   * @param {{ srfnav?: string; path: string }} info 当前系统的路由的从一级到最后一级的所有路径。
+   */
+  onRouterChange(info: { srfnav: string; path: string }): void {
+    if (this.state.srfnav !== info.srfnav) {
+      this.state.srfnav = info.srfnav;
+      this.defaultNavBySrfnav();
+    }
+  }
 }

package/src/controller/control/exp-bar/tree-exp-bar.controller.ts

@@ -119,6 +119,7 @@ export class TreeExpBarController
     }
     const result = this.prepareParams(nodeModel, deData, context, params);
     result.context.currentSrfNav = nodeId;
+    this.state.srfnav = nodeId;
     return {
       key: nodeId,
       viewId: nodeModel.navAppViewId,

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

@@ -186,6 +186,12 @@ export class EditFormController
     this.actionNotification(`${isCreate ? 'CREATE' : 'UPDATE'}SUCCESS`, {
       default: `${this.data.srfmajortext || ''}保存成功`,
     });
+    if (this.view.modal.mode === 'ROUTE') {
+      ibiz.mc.command.send(
+        this.data.$origin,
+        isCreate ? 'OBJECTCREATED' : 'OBJECTUPDATED',
+      );
+    }
     return this.data;
   }
 
@@ -232,6 +238,10 @@ export class EditFormController
     await this.evt.emit('onRemoveSuccess', undefined);
     this.actionNotification('REMOVESUCCESS');
 
+    if (this.view.modal.mode === 'ROUTE') {
+      ibiz.mc.command.send(this.data.$origin, 'OBJECTREMOVED');
+    }
+
     return ok;
   }
 
@@ -275,7 +285,7 @@ export class EditFormController
 
     const { appDEMethodId, defiupdateDetails, customCode, scriptCode } =
       formItemUpdate;
-    const updateItems = defiupdateDetails!.map(item => item.id!);
+    const updateItems = defiupdateDetails?.map(item => item.id!);
 
     let updateData: IData; // 要修改的数据
     if (customCode && scriptCode) {

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

@@ -146,9 +146,9 @@ export class FormDRUIPartController extends FormDetailController<IDEFormDRUIPart
         newContext,
         convertNavData(
           navContexts!,
-          this.form.context,
-          this.form.params,
           this.form.data,
+          this.form.params,
+          this.form.context,
         ),
       );
     }
@@ -156,9 +156,9 @@ export class FormDRUIPartController extends FormDetailController<IDEFormDRUIPart
     // 处理导航视图参数
     const newParams = convertNavData(
       this.model.navigateParams!,
+      this.form.data,
       this.form.params,
       this.form.context,
-      this.form.data,
     );
 
     if (!this.state.viewComponentKey) {

package/src/controller/control/grid/grid-column/grid-field-column/grid-field-column.controller.ts

@@ -90,12 +90,12 @@ export class GridFieldColumnController extends GridColumnController<IDEGridField
     const { navigateContexts, navigateParams } = parseUserParams(userParam);
     let selfContext = {};
     if (navigateContexts && data) {
-      selfContext = convertNavData(navigateContexts!, context, params, data);
+      selfContext = convertNavData(navigateContexts!, data, params, context);
     }
     const _context = Object.assign(context.clone(), selfContext);
     let selfParams = {};
     if (navigateParams && data) {
-      selfParams = convertNavData(navigateParams!, context, params, data);
+      selfParams = convertNavData(navigateParams!, data, params, context);
     }
     const _params: IParams = { ...params, ...selfParams };
     return { context: _context, params: _params };

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

@@ -65,13 +65,13 @@ export class PickupViewPanelController
     if (navigateContexts) {
       Object.assign(
         context,
-        convertNavData(navigateContexts, this.context, this.params),
+        convertNavData(navigateContexts, this.params, this.context),
       );
     }
     if (navigateParams) {
       Object.assign(
         params,
-        convertNavData(navigateParams, this.context, this.params),
+        convertNavData(navigateParams, this.params, this.context),
       );
     }
     this.state.context = context;

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

@@ -1,6 +1,7 @@
 /* eslint-disable no-await-in-loop */
 import { ModelError, RuntimeModelError } from '@ibiz-template/core';
 import { IAppDELogic } from '@ibiz/model-core';
+import { ScriptFactory, ScriptFunction } from '../utils';
 import { DELogicContext } from './de-logic-context';
 import {
   AppendParamNode,
@@ -48,6 +49,15 @@ export class DELogic {
    */
   protected params: Map<string, DELogicParam> = new Map();
 
+  /**
+   * 脚本函数
+   * @author lxm
+   * @date 2023-09-13 04:25:27
+   * @protected
+   * @type {ScriptFunction}
+   */
+  protected scriptFn?: ScriptFunction;
+
   /**
    * Creates an instance of DELogic.
    * @author lxm
@@ -55,6 +65,17 @@ export class DELogic {
    * @param {IAppDELogic} model
    */
   constructor(protected model: IAppDELogic) {
+    // 脚本代码模式
+    if (model.customCode) {
+      if (!model.scriptCode) {
+        throw new RuntimeModelError(model, '脚本代码模式没有配置脚本代码');
+      }
+      this.scriptFn = ScriptFactory.createScriptFn([], model.scriptCode, {
+        isAsync: true,
+      });
+      return;
+    }
+
     if (!model.delogicNodes?.length) {
       throw new RuntimeModelError(model, '实体逻辑没有配置逻辑节点');
     }
@@ -148,6 +169,9 @@ export class DELogic {
    * @return {*}  {Promise<IData>}
    */
   async exec(context: IParams, data: IData, params: IParams): Promise<unknown> {
+    if (this.scriptFn) {
+      return this.scriptFn.exec({ context, data, params });
+    }
     const ctx = new DELogicContext(this.params, context, data, params);
     this.initLogicParams(ctx);
     const { startDELogicNodeId } = this.model;

package/src/interface/common/i-global-config/i-global-view-config.ts

@@ -18,4 +18,13 @@ export interface IGlobalViewConfig {
    * @type {boolean}
    */
   enableDataInfoBar: boolean;
+
+  /**
+   * 全局导航是否启用缓存
+   *
+   * @author chitanda
+   * @date 2023-09-15 12:09:09
+   * @type {boolean}
+   */
+  enableExpCache: boolean;
 }

package/src/interface/controller/controller/control/i-exp-bar-control.controller.ts

@@ -57,4 +57,12 @@ export interface IExpBarControlController<
    * @memberof ITreeExpBarController
    */
   getNavViewMsg(data: IData, context: IContext, params: IParams): INavViewMsg;
+
+  /**
+   * 路由变更处理回调
+   * @author lxm
+   * @date 2023-09-14 07:03:39
+   * @param {{ srfnav?: string; path: string }} info 当前系统的路由的从一级到最后一级的所有路径。
+   */
+  onRouterChange(info: { srfnav: string; path: string }): void;
 }

package/src/interface/provider/i-control.provider.ts

@@ -1,3 +1,7 @@
+import { IControl } from '@ibiz/model-core';
+import { CTX } from '../../controller';
+import { IControlController } from '../controller';
+
 /**
  * 部件适配器的接口
  *
@@ -16,4 +20,22 @@ export interface IControlProvider {
    */
   // eslint-disable-next-line @typescript-eslint/no-explicit-any
   component: any;
+
+  /**
+   * 创建部件控制器
+   *
+   * @author lxm
+   * @date 2023-09-15 11:52:22
+   * @param {IControl} model 部件模型
+   * @param {IContext} context 上下文
+   * @param {IParams} [params] 视图参数
+   * @param {CTX} [ctx]
+   * @return {*}  {IControlController}
+   */
+  createController?(
+    model: IControl,
+    context: IContext,
+    params: IParams,
+    ctx: CTX,
+  ): IControlController;
 }

package/src/interface/provider/i-view.provider.ts

@@ -1,3 +1,7 @@
+import { IAppView } from '@ibiz/model-core';
+import { CTX } from '../../controller';
+import { IViewController } from '../controller';
+
 /**
  * 视图适配器的接口
  *
@@ -16,4 +20,22 @@ export interface IViewProvider {
    */
   // eslint-disable-next-line @typescript-eslint/no-explicit-any
   component: any;
+
+  /**
+   * 创建视图控制器
+   *
+   * @author lxm
+   * @date 2023-09-15 11:49:26
+   * @param {IAppView} model 视图模型
+   * @param {IContext} context 上下文
+   * @param {IParams} [params] 视图参数
+   * @param {CTX} [ctx]
+   * @return {*}  {IViewController}
+   */
+  createController?(
+    model: IAppView,
+    context: IContext,
+    params?: IParams,
+    ctx?: CTX,
+  ): IViewController;
 }

package/src/logic-scheduler/executor/app-ui-logic-executor.ts

@@ -93,14 +93,14 @@ export class AppUILogicExecutor extends LogicExecutor {
     const navContexts: INavigateParam[] = openViewRef.navigateContexts || [];
     const tempContext = Object.assign(
       context,
-      convertNavData(navContexts!, context, params, data[0]),
+      convertNavData(navContexts!, data[0], params, context),
     );
 
     // 处理导航视图参数
     let tempParams: IData = {};
     const navParams = openViewRef.navigateParams;
     if (notNilEmpty(navParams)) {
-      tempParams = convertNavData(navParams!, params, context, data[0]);
+      tempParams = convertNavData(navParams!, data[0], params, context);
     }
 
     // 打开视图
@@ -164,13 +164,13 @@ export class AppUILogicExecutor extends LogicExecutor {
     const _data = data?.[0] || {};
     const navContexts = newViewRef.navigateContexts;
     if (notNilEmpty(navContexts)) {
-      tempContext = convertNavData(navContexts!, context, params, _data);
+      tempContext = convertNavData(navContexts!, _data, params, context);
     }
     tempContext = Object.assign(context, tempContext);
 
     const navParams = newViewRef.navigateParams;
     if (notNilEmpty(navParams)) {
-      tempParams = convertNavData(navParams!, params, context, _data);
+      tempParams = convertNavData(navParams!, _data, params, context);
     }
 
     // 拷贝数据处理

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

@@ -74,9 +74,7 @@ export class MethodDto {
             for (let j = 0; j < items.length; j++) {
               arr.push(await dto.get(context, items[j]));
             }
-            if (arr.length > 0) {
-              params[key] = arr;
-            }
+            params[key] = arr;
           }
           break;
         }
@@ -119,6 +117,8 @@ export class MethodDto {
             const items: IData[] = datum[key];
             if (items) {
               await dto.sets(context, items);
+            } else {
+              await dto.sets(context, []);
             }
           });
         for (let i = 0; i < all.length; i++) {

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

@@ -122,7 +122,6 @@ export abstract class Method {
             `${path}/${methodName}`,
             notNilEmpty(data) ? data : params,
           );
-          const entity = this.createEntity(data);
           break;
         }
         case 'DELETE':

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

@@ -1,4 +1,3 @@
-import { DataTypes } from '@ibiz-template/core';
 import { clone, isNil } from 'ramda';
 import { Srfuf } from '../constant';
 import { UIMapField } from './ui-map-field';
@@ -142,10 +141,7 @@ export class ControlVO {
     this.$dataUIMap.forEach((mapField, key) => {
       const value = mapField.dataKey;
       // 关联映射属性
-      const forceNumber =
-        mapField.dataType !== undefined &&
-        DataTypes.isNumber(mapField.dataType);
-      this.linkProperty(key, value, mapField.isOriginField, forceNumber);
+      this.linkProperty(key, value, mapField);
     });
 
     // 映射属性里没有涉及到的建立直接关联，用于使用实体属性也要取到值的场景。
@@ -172,9 +168,9 @@ export class ControlVO {
   private linkProperty(
     uiKey: string,
     dataKey: string,
-    isOriginField: boolean = true,
-    forceNumber: boolean = false,
+    mapField?: UIMapField,
   ): void {
+    const isOriginField = mapField ? mapField.isOriginField : true;
     // srfuf和srfkey不做处理
     if (uiKey === 'srfuf') {
       return;
@@ -195,15 +191,15 @@ export class ControlVO {
             : this.$origin[dataKey];
         },
         set(val) {
-          // 非空且强制转数值时，转换值的类型
-          let val2 = forceNumber && !isNil(val) ? Number(val) : val;
-          if (Number.isNaN(val2)) {
-            val2 = val; // NaN时还原值
-            ibiz.log.error(`${val}不能转换成数字`);
-          }
-          this.$origin[dataKey] = val2;
+          // 有mapField的走它的转换
+          this.$origin[dataKey] = mapField ? mapField.convertVal(val) : val;
         },
       });
+
+      // 一开始初始化的时候先把值转换一下。
+      if (mapField) {
+        this[uiKey] = mapField.convertVal(this.$origin[dataKey]);
+      }
     } else {
       Object.defineProperty(this, uiKey, {
         enumerable: true,

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

@@ -1,3 +1,4 @@
+import { DataTypes } from '@ibiz-template/core';
 import { isNil } from 'ramda';
 
 /**
@@ -70,4 +71,31 @@ export class UIMapField {
       this.dataType = opts.dataType;
     }
   }
+
+  /**
+   * 值转换
+   * @author lxm
+   * @date 2023-09-14 06:45:44
+   * @param {unknown} value 原值
+   */
+  convertVal(value: unknown): unknown {
+    // 没有数据类型的给原值
+    if (!this.dataType) {
+      return value;
+    }
+
+    // 数值转换
+    if (DataTypes.isNumber(this.dataType)) {
+      const numVal = !isNil(value) && value !== '' ? Number(value) : value;
+
+      if (Number.isNaN(numVal)) {
+        // 不能转换的给原值
+        ibiz.log.debug(`${value}不能转换成数字`);
+        return value;
+      }
+      return numVal;
+    }
+
+    return value;
+  }
 }

package/src/ui-action/provider/ui-action-provider-base.ts

@@ -249,9 +249,9 @@ export abstract class UIActionProviderBase implements IUIActionProvider {
     // 处理自定义导航上下文
     const tempContext = convertNavData(
       navContexts,
-      context,
-      params,
       isMultiData ? formatMultiData(navContexts, data) : data[0] || {},
+      params,
+      context,
     );
     Object.assign(resultContext, tempContext);
 
@@ -259,9 +259,9 @@ export abstract class UIActionProviderBase implements IUIActionProvider {
     const navParams = action.navigateParams;
     const resultParams = convertNavData(
       navParams,
-      resultContext,
-      params,
       isMultiData ? formatMultiData(navParams, data) : data[0] || {},
+      params,
+      resultContext,
     );
     return { resultContext, resultData, resultParams };
   }

package/src/utils/nav-params/calc-nav-params.ts

@@ -61,8 +61,8 @@ export function calcNavParams(
   }
 
   // 自定义导航视图参数和上下文
-  const tempContext = convertNavData(navContexts, context, params, data);
-  const tempParams = convertNavData(navParams, context, params, data);
+  const tempContext = convertNavData(navContexts, data, params, context);
+  const tempParams = convertNavData(navParams, data, params, context);
   Object.assign(resultContext, tempContext);
   Object.assign(resultParams, tempParams);