@ibiz-template/runtime 0.1.23 → 0.1.24

package/out/utils/nav-params/nav-params.js

@@ -1,5 +1,32 @@
 import { isEmpty } from 'lodash-es';
 import { isNilOrEmpty, notNilEmpty } from 'qx-util';
+/**
+ * 把对象格式的导航参数转换成数组格式的导航参数
+ * @author lxm
+ * @date 2023-07-10 03:33:14
+ * @export
+ * @param {IData} navParams
+ * @return {*}  {IPSNavigateParam[]}
+ */
+export function convertObjectToNavParams(navParams) {
+    const result = [];
+    const reg = /^%(.+)%$/;
+    // eslint-disable-next-line guard-for-in
+    for (const key in navParams) {
+        let rawValue = true;
+        let value = navParams[key];
+        if (notNilEmpty(navParams[key]) && reg.test(navParams[key])) {
+            rawValue = false;
+            value = navParams[key].substring(1, navParams[key].length - 1);
+        }
+        result.push({
+            key: key.toLowerCase(),
+            rawValue,
+            value,
+        });
+    }
+    return result;
+}
 /**
  * 转换导航数据(如导航上下文，导航视图参数)
  * - 把%xxx%,转换成origins元素里对应叫xxx的值
@@ -10,21 +37,42 @@ import { isNilOrEmpty, notNilEmpty } from 'qx-util';
  * @author lxm
  * @date 2022-08-22 11:08:18
  * @export
- * @param {INavigateParam[]} naviDatas 导航参数
+ * @param {INavigateParam[]} navParams 导航参数
  * @param {...IData[]} origins 转换数据来源集合
  */
-export function convertNavData(naviDatas, ...origins) {
+export function convertNavData(navParams, ...origins) {
     // 如果导航参数不存在或者为空对象，返回{}
-    if (!naviDatas || isEmpty(naviDatas)) {
+    if (!navParams || isEmpty(navParams)) {
         return {};
     }
-    if (Object.prototype.toString.call(naviDatas) === '[object Array]') {
-        return convertNavDataByArray(naviDatas, ...origins);
-    }
-    if (Object.prototype.toString.call(naviDatas) === '[object Object]') {
-        return convertNavDataByObject(naviDatas, ...origins);
-    }
-    return {};
+    // 把对象形式的导航参数转换成INavigateParam[]形式
+    const navParamsArr = Array.isArray(navParams)
+        ? navParams
+        : convertObjectToNavParams(navParams);
+    return convertNavDataByArray(navParamsArr, ...origins);
+}
+/**
+ * 从origins每个元素里找到对应属性key的值
+ * 如果都找不到抛异常。
+ * @author lxm
+ * @date 2023-09-13 11:38:43
+ * @param {IData[]} origins 来源数据集合
+ * @param {string} key 属性标识
+ * @return {*}  {{ find: boolean; value: unknown }} 返回find是否找到值，value为找到的值，可以是空值
+ */
+function getVal(origins, key) {
+    // 找到origins里第一个有该属性的的项
+    const findOrigin = origins.find(item => {
+        if (isNilOrEmpty(item)) {
+            return false;
+        }
+        return (
+        // proxy数据判断是否能拿到值
+        item[key] ||
+            // 上下文等判断是否有这个属性，如果有且值为空，则赋该空值
+            Object.prototype.hasOwnProperty.call(item, key));
+    });
+    return { find: !!findOrigin, value: findOrigin === null || findOrigin === void 0 ? void 0 : findOrigin[key] };
 }
 /**
  * 通过模型中的导航数组 转换导航数据(如导航上下文，导航视图参数)
@@ -40,91 +88,38 @@ export function convertNavData(naviDatas, ...origins) {
  * @param {...IData[]} origins 转换数据来源集合
  */
 export function convertNavDataByArray(naviDatas, ...origins) {
+    const regex = /\$\{[^}]*\}/g; // 匹配${xxx}格式字符串
     const result = {};
     for (const naviData of naviDatas) {
-        if (notNilEmpty(naviData.value) && !naviData.rawValue) {
-            // 找到origins里第一个有该属性的的项
-            const findOrigin = origins.find(item => {
-                if (isNilOrEmpty(item)) {
-                    return false;
+        if (!naviData.rawValue) {
+            const matchArr = naviData.value.match(regex);
+            if (matchArr !== null) {
+                // 有${xxx}的找每一个xxx的值，替换原始字符串里的值，最后赋值处理过的字符串
+                let valueStr = naviData.value;
+                matchArr.forEach(key => {
+                    // 没有${xxx}
+                    const { find, value } = getVal(origins, key.slice(2, -1));
+                    if (find) {
+                        valueStr = valueStr.replace(key, `${value}`);
+                    }
+                });
+                result[naviData.key.toLowerCase()] = valueStr;
+            }
+            else {
+                // 没有${xxx}
+                const { find, value } = getVal(origins, naviData.value);
+                if (find) {
+                    result[naviData.key.toLowerCase()] = value;
                 }
-                return (
-                // proxy数据判断是否能拿到值
-                item[naviData.value] ||
-                    // 上下文等判断是否有这个属性，如果有且值为空，则赋该空值
-                    Object.prototype.hasOwnProperty.call(item, naviData.value));
-            });
-            if (findOrigin) {
-                result[naviData.key.toLowerCase()] = findOrigin[naviData.value];
             }
         }
         else {
+            // 直接值，空值时赋null
             result[naviData.key.toLowerCase()] = naviData.value || null;
         }
     }
     return result;
 }
-/**
- * 通过对象 转换导航数据(如导航上下文，导航视图参数)
- * - 把%xxx%,转换成origins元素里对应叫xxx的值
- * - 按顺序查找origins的元素，且只要有xxx的属性就算找到，不管值是否为空。
- * - naviData里{a:%xxx%}，origins里找不到xxx则返回值里不存在a属性
- * - naviData里非%xxx%形式的，都当成直接值原样返回，包括空值。
- *
- * @author lxm
- * @date 2022-08-22 11:08:18
- * @export
- * @param {IData} naviData
- * @param {...IData[]} origins
- */
-export function convertNavDataByObject(naviData, ...origins) {
-    const result = {};
-    const reg = /^%(.+)%$/;
-    for (const key in naviData) {
-        if (notNilEmpty(naviData[key]) && reg.test(naviData[key])) {
-            // 获取值的属性名称
-            const valueKey = naviData[key].substring(1, naviData[key].length - 1);
-            // 找到origins里第一个有该属性的的项
-            const findOrigin = origins.find(item => {
-                return Object.prototype.hasOwnProperty.call(item, valueKey);
-            });
-            if (findOrigin) {
-                result[key.toLowerCase()] = findOrigin[valueKey];
-            }
-        }
-        else {
-            result[key.toLowerCase()] = naviData[key] || null;
-        }
-    }
-    return result;
-}
-/**
- * 把对象格式的导航参数转换成数组格式的导航参数
- * @author lxm
- * @date 2023-07-10 03:33:14
- * @export
- * @param {IData} naviData
- * @return {*}  {IPSNavigateParam[]}
- */
-export function convertObjectToNavParams(naviData) {
-    const result = [];
-    const reg = /^%(.+)%$/;
-    // eslint-disable-next-line guard-for-in
-    for (const key in naviData) {
-        let rawValue = true;
-        let value = naviData[key];
-        if (notNilEmpty(naviData[key]) && reg.test(naviData[key])) {
-            rawValue = false;
-            value = naviData[key].substring(1, naviData[key].length - 1);
-        }
-        result.push({
-            key: key.toLowerCase(),
-            rawValue,
-            value,
-        });
-    }
-    return result;
-}
 /**
  * 根据导航参数把多条数据转换成单条数据，用；分隔
  * @author lxm

package/out/utils/open-redirect-view/open-redirect-view.js

@@ -83,11 +83,11 @@ export async function openDERedirectView(appView, context, params = {}, opts = {
     var _a;
     // 计算重定向视图上下文参数转换
     const navContext = appView.appViewNavContexts || [];
-    const navContextData = convertNavData(navContext, context, params);
+    const navContextData = convertNavData(navContext, params, context);
     context = Object.assign(context.clone(), navContextData);
     // 计算重定向视图视图参数转换
     const navParams = appView.appViewNavParams || [];
-    const navParamsData = convertNavData(navParams, context, params);
+    const navParamsData = convertNavData(navParams, params, context);
     Object.assign(params, navParamsData);
     // 重定向视图对应应用实体
     const entityId = appView.appDataEntityId;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@ibiz-template/runtime",
-  "version": "0.1.23",
+  "version": "0.1.24",
   "description": "控制器包",
   "type": "module",
   "main": "out/index.js",
@@ -29,7 +29,7 @@
   "author": "chitanda",
   "license": "MIT",
   "devDependencies": {
-    "@ibiz-template/core": "^0.1.23",
+    "@ibiz-template/core": "^0.1.24",
     "@ibiz/model-core": "^0.0.16",
     "@types/path-browserify": "^1.0.0",
     "@types/qs": "^6.9.8",
@@ -57,5 +57,5 @@
     "qx-util": "^0.4.8",
     "ramda": "^0.29.0"
   },
-  "gitHead": "7a5c053d7e48ffc3f6e38d84ef07f2aa1df007a4"
+  "gitHead": "b1d394ad9b4d7e81e607054c31f056e8299855b9"
 }

package/src/command/app/app-func/app-func.ts

@@ -52,8 +52,8 @@ export class AppFuncCommand {
     // 导航参数转换
     const { navigateContexts, navigateParams, appFuncType } = appFunc;
     const _context = context.clone();
-    Object.assign(_context, convertNavData(navigateContexts, context, params));
-    const _params = convertNavData(navigateParams, context, params);
+    Object.assign(_context, convertNavData(navigateContexts, params, context));
+    const _params = convertNavData(navigateParams, params, context);
 
     switch (appFuncType) {
       case 'APPVIEW':

package/src/controller/common/control/control.controller.ts

@@ -296,6 +296,7 @@ export class ControlController<
     }
 
     if (opts?.error) {
+      ibiz.log.error(opts.error);
       // 报错时抛错误
       throw new NoticeError(message, duration);
     } else {

package/src/controller/common/control/md-control.controller.ts

@@ -1,6 +1,6 @@
 /* eslint-disable max-classes-per-file */
 import { isElementSame, RuntimeError } from '@ibiz-template/core';
-import { IMDControl } from '@ibiz/model-core';
+import { IAppDataEntity, IMDControl } from '@ibiz/model-core';
 import {
   IMDControlController,
   IMDControlEvent,
@@ -68,21 +68,52 @@ export class MDControlController<
    */
   protected fieldIdNameMap = new Map<string, string>();
 
+  /**
+   * 当前多数据部件对应的应用实体对象
+   *
+   * @author chitanda
+   * @date 2023-09-13 17:09:32
+   * @protected
+   * @type {IAppDataEntity}
+   */
+  protected dataEntity!: IAppDataEntity;
+
   protected async onCreated(): Promise<void> {
     await super.onCreated();
 
     // 初始化实体属性id和name的映射
-    const dataEntity = await ibiz.hub.getAppDataEntity(
+    this.dataEntity = await ibiz.hub.getAppDataEntity(
       this.model.appDataEntityId!,
     );
-    dataEntity.appDEFields?.forEach(field => {
+    this.dataEntity.appDEFields?.forEach(field => {
       this.fieldIdNameMap.set(field.id!, field.name!);
     });
+    this.onDataChange = this.onDataChange.bind(this);
+    ibiz.mc.command.change.on(this.onDataChange);
 
     // 设置默认排序
     this.setSort();
   }
 
+  protected onDestroyed(): Promise<void> {
+    ibiz.mc.command.change.off(this.onDataChange);
+    return super.onDestroyed();
+  }
+
+  /**
+   * 当数据放生变更时，若为当前应用实体数据。则多数据部件进行刷新
+   *
+   * @author chitanda
+   * @date 2023-09-13 17:09:04
+   * @protected
+   * @param {IData} msg
+   */
+  protected onDataChange(msg: IData): void {
+    if (msg.data && msg.data.srfdecodename === this.dataEntity.codeName) {
+      this.refresh();
+    }
+  }
+
   /**
    * 设置排序
    * 无参数时设置的是默认排序。

package/src/controller/common/editor/editor.controller.ts

@@ -156,13 +156,13 @@ export class EditorController<T extends IEditor = IEditor>
       .model as INavigateParamContainer;
     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/common/view/view.controller.ts

@@ -321,7 +321,7 @@ export class ViewController<
     const navContexts = this.model.appViewNavContexts;
     let context = {};
     if (notNilEmpty(navContexts)) {
-      context = convertNavData(navContexts!, this.context, this.params);
+      context = convertNavData(navContexts!, this.params, this.context);
     }
     Object.assign(this.context, context);
 
@@ -329,7 +329,7 @@ export class ViewController<
     const navParams = this.model.appViewNavParams;
     let params = {};
     if (notNilEmpty(navParams)) {
-      params = convertNavData(navParams!, this.context, this.params);
+      params = convertNavData(navParams!, this.params, this.context);
     }
     Object.assign(this.params, params);
 

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/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

@@ -196,7 +196,8 @@ export class ControlVO {
         },
         set(val) {
           // 非空且强制转数值时，转换值的类型
-          let val2 = forceNumber && !isNil(val) ? Number(val) : val;
+          let val2 =
+            forceNumber && !isNil(val) && val !== '' ? Number(val) : val;
           if (Number.isNaN(val2)) {
             val2 = val; // NaN时还原值
             ibiz.log.error(`${val}不能转换成数字`);

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);