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

package/dist/index.esm.js

@@ -6660,34 +6660,64 @@ var HandlebarsUtil = class {
 // src/utils/nav-params/nav-params.ts
 import { isEmpty } from "lodash-es";
 import { isNilOrEmpty, notNilEmpty } from "qx-util";
-function convertNavData(naviDatas, ...origins) {
-  if (!naviDatas || isEmpty(naviDatas)) {
-    return {};
-  }
-  if (Object.prototype.toString.call(naviDatas) === "[object Array]") {
-    return convertNavDataByArray(naviDatas, ...origins);
+function convertObjectToNavParams(navParams) {
+  const result = [];
+  const reg2 = /^%(.+)%$/;
+  for (const key in navParams) {
+    let rawValue = true;
+    let value = navParams[key];
+    if (notNilEmpty(navParams[key]) && reg2.test(navParams[key])) {
+      rawValue = false;
+      value = navParams[key].substring(1, navParams[key].length - 1);
+    }
+    result.push({
+      key: key.toLowerCase(),
+      rawValue,
+      value
+    });
   }
-  if (Object.prototype.toString.call(naviDatas) === "[object Object]") {
-    return convertNavDataByObject(naviDatas, ...origins);
+  return result;
+}
+function convertNavData(navParams, ...origins) {
+  if (!navParams || isEmpty(navParams)) {
+    return {};
   }
-  return {};
+  const navParamsArr = Array.isArray(navParams) ? navParams : convertObjectToNavParams(navParams);
+  return convertNavDataByArray(navParamsArr, ...origins);
+}
+function getVal(origins, key) {
+  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 ? void 0 : findOrigin[key] };
 }
 function convertNavDataByArray(naviDatas, ...origins) {
+  const regex = /\$\{[^}]*\}/g;
   const result = {};
   for (const naviData of naviDatas) {
-    if (notNilEmpty(naviData.value) && !naviData.rawValue) {
-      const findOrigin = origins.find((item) => {
-        if (isNilOrEmpty(item)) {
-          return false;
+    if (!naviData.rawValue) {
+      const matchArr = naviData.value.match(regex);
+      if (matchArr !== null) {
+        let valueStr = naviData.value;
+        matchArr.forEach((key) => {
+          const { find, value } = getVal(origins, key.slice(2, -1));
+          if (find) {
+            valueStr = valueStr.replace(key, "".concat(value));
+          }
+        });
+        result[naviData.key.toLowerCase()] = valueStr;
+      } else {
+        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 {
       result[naviData.key.toLowerCase()] = naviData.value || null;
@@ -6695,42 +6725,6 @@ function convertNavDataByArray(naviDatas, ...origins) {
   }
   return result;
 }
-function convertNavDataByObject(naviData, ...origins) {
-  const result = {};
-  const reg2 = /^%(.+)%$/;
-  for (const key in naviData) {
-    if (notNilEmpty(naviData[key]) && reg2.test(naviData[key])) {
-      const valueKey = naviData[key].substring(1, naviData[key].length - 1);
-      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;
-}
-function convertObjectToNavParams(naviData) {
-  const result = [];
-  const reg2 = /^%(.+)%$/;
-  for (const key in naviData) {
-    let rawValue = true;
-    let value = naviData[key];
-    if (notNilEmpty(naviData[key]) && reg2.test(naviData[key])) {
-      rawValue = false;
-      value = naviData[key].substring(1, naviData[key].length - 1);
-    }
-    result.push({
-      key: key.toLowerCase(),
-      rawValue,
-      value
-    });
-  }
-  return result;
-}
 function formatMultiData(navParams, dataArr) {
   const result = {};
   if (!navParams) {
@@ -6765,8 +6759,8 @@ function calcNavParams(model, originParams) {
       resultParams["n_".concat(pickupDEFName.toLowerCase(), "_eq")] = deSrfkey;
     }
   }
-  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);
   return {
@@ -7154,10 +7148,10 @@ async function toLocalOpenWFRedirectView(context, linkUrl, opts = {}) {
 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;
   const key = calcDeCodeNameById(entityId);
@@ -8746,8 +8740,8 @@ var _AppFuncCommand = 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":
         return this.openAppView(appFunc, _context, _params, opts);
@@ -11361,9 +11355,7 @@ var MethodDto = 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;
         }
@@ -11401,6 +11393,8 @@ var MethodDto = class _MethodDto {
           const items = datum[key];
           if (items) {
             await dto.sets(context, items);
+          } else {
+            await dto.sets(context, []);
           }
         });
         for (let i = 0; i < all.length; i++) {
@@ -11584,7 +11578,6 @@ var Method = class {
             "".concat(path2, "/").concat(methodName),
             notNilEmpty5(data) ? data : params
           );
-          const entity = this.createEntity(data);
           break;
         }
         case "DELETE":
@@ -12476,6 +12469,15 @@ var DELogic = class {
      */
     this.params = /* @__PURE__ */ new Map();
     var _a, _b;
+    if (model.customCode) {
+      if (!model.scriptCode) {
+        throw new RuntimeModelError17(model, "\u811A\u672C\u4EE3\u7801\u6A21\u5F0F\u6CA1\u6709\u914D\u7F6E\u811A\u672C\u4EE3\u7801");
+      }
+      this.scriptFn = ScriptFactory.createScriptFn([], model.scriptCode, {
+        isAsync: true
+      });
+      return;
+    }
     if (!((_a = model.delogicNodes) == null ? void 0 : _a.length)) {
       throw new RuntimeModelError17(model, "\u5B9E\u4F53\u903B\u8F91\u6CA1\u6709\u914D\u7F6E\u903B\u8F91\u8282\u70B9");
     }
@@ -12566,6 +12568,9 @@ var DELogic = class {
    * @return {*}  {Promise<IData>}
    */
   async exec(context, data, params) {
+    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;
@@ -13346,7 +13351,7 @@ var ControlVO = class _ControlVO {
           return uiKey === "srfkey" ? this.$origin[dataKey] || this.$origin[uiKey] : this.$origin[dataKey];
         },
         set(val) {
-          let val2 = forceNumber && !isNil8(val) ? Number(val) : val;
+          let val2 = forceNumber && !isNil8(val) && val !== "" ? Number(val) : val;
           if (Number.isNaN(val2)) {
             val2 = val;
             ibiz.log.error("".concat(val, "\u4E0D\u80FD\u8F6C\u6362\u6210\u6570\u5B57"));
@@ -15611,13 +15616,13 @@ var ViewController = class extends BaseController {
     const navContexts = this.model.appViewNavContexts;
     let context = {};
     if (notNilEmpty6(navContexts)) {
-      context = convertNavData(navContexts, this.context, this.params);
+      context = convertNavData(navContexts, this.params, this.context);
     }
     Object.assign(this.context, context);
     const navParams = this.model.appViewNavParams;
     let params = {};
     if (notNilEmpty6(navParams)) {
-      params = convertNavData(navParams, this.context, this.params);
+      params = convertNavData(navParams, this.params, this.context);
     }
     Object.assign(this.params, params);
     if (this.state.isMounted) {
@@ -15715,6 +15720,14 @@ var EditorController = class {
    * @param {T} model
    */
   constructor(model, parent) {
+    /**
+     * 编辑器样式
+     *
+     * @author chitanda
+     * @date 2023-09-12 16:09:40
+     * @type {IData}
+     */
+    this.style = {};
     /**
      * 占位
      * @return {*}
@@ -15763,6 +15776,22 @@ var EditorController = class {
         this.editorParams[key] = this.model.editorParams[key];
       });
     }
+    if (this.model.editorWidth) {
+      const width = this.model.editorWidth;
+      if (width > 0 && width <= 1) {
+        this.style.width = "".concat(width * 100, "%");
+      } else {
+        this.style.width = "".concat(width, "px");
+      }
+    }
+    if (this.model.editorHeight) {
+      const height = this.model.editorHeight;
+      if (height > 0 && height <= 1) {
+        this.style.height = "".concat(height * 100, "%");
+      } else {
+        this.style.height = "".concat(height, "px");
+      }
+    }
   }
   /**
    * 公共参数处理，计算上下文和视图参数
@@ -15775,12 +15804,12 @@ var EditorController = class {
     const { navigateContexts, navigateParams } = this.model;
     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 = { ...params, ...selfParams };
     return { context: _context, params: _params };
@@ -16051,6 +16080,7 @@ var ControlController = class extends BaseController {
       return;
     }
     if (opts == null ? void 0 : opts.error) {
+      ibiz.log.error(opts.error);
       throw new NoticeError(message, duration);
     } else {
       ibiz.message.success(message, duration, duration === 0);
@@ -16092,14 +16122,33 @@ var MDControlController = class extends ControlController {
   async onCreated() {
     var _a;
     await super.onCreated();
-    const dataEntity = await ibiz.hub.getAppDataEntity(
+    this.dataEntity = await ibiz.hub.getAppDataEntity(
       this.model.appDataEntityId
     );
-    (_a = dataEntity.appDEFields) == null ? void 0 : _a.forEach((field) => {
+    (_a = this.dataEntity.appDEFields) == null ? void 0 : _a.forEach((field) => {
       this.fieldIdNameMap.set(field.id, field.name);
     });
+    this.onDataChange = this.onDataChange.bind(this);
+    ibiz.mc.command.change.on(this.onDataChange);
     this.setSort();
   }
+  onDestroyed() {
+    ibiz.mc.command.change.off(this.onDataChange);
+    return super.onDestroyed();
+  }
+  /**
+   * 当数据放生变更时，若为当前应用实体数据。则多数据部件进行刷新
+   *
+   * @author chitanda
+   * @date 2023-09-13 17:09:04
+   * @protected
+   * @param {IData} msg
+   */
+  onDataChange(msg) {
+    if (msg.data && msg.data.srfdecodename === this.dataEntity.codeName) {
+      this.refresh();
+    }
+  }
   /**
    * 设置排序
    * 无参数时设置的是默认排序。
@@ -19332,17 +19381,17 @@ var UIActionProviderBase = class {
     const isMultiData = ["MULTIKEY", "MULTIDATA"].includes(action.actionTarget) && data.length > 0;
     const tempContext = convertNavData(
       navContexts,
-      context,
+      isMultiData ? formatMultiData(navContexts, data) : data[0] || {},
       params,
-      isMultiData ? formatMultiData(navContexts, data) : data[0] || {}
+      context
     );
     Object.assign(resultContext, tempContext);
     const navParams = action.navigateParams;
     const resultParams = convertNavData(
       navParams,
-      resultContext,
+      isMultiData ? formatMultiData(navParams, data) : data[0] || {},
       params,
-      isMultiData ? formatMultiData(navParams, data) : data[0] || {}
+      resultContext
     );
     return { resultContext, resultData, resultParams };
   }
@@ -19452,7 +19501,7 @@ var SysUIActionProvider = class extends UIActionProviderBase {
       ["GRIDVIEW_COPYACTION", "Copy"],
       ["GRIDVIEW_VIEWACTION", "View"],
       ["GRIDVIEW_SAVEROWACTION", "SaveRow"],
-      ["APP_LOGIN", "login"],
+      ["APP_LOGIN", "Login"],
       ["APP_LOGOUT", "logout"]
     ]);
   }
@@ -21623,17 +21672,17 @@ var FormDRUIPartController = class extends FormDetailController {
         newContext,
         convertNavData(
           navContexts,
-          this.form.context,
+          this.form.data,
           this.form.params,
-          this.form.data
+          this.form.context
         )
       );
     }
     const newParams = convertNavData(
       this.model.navigateParams,
+      this.form.data,
       this.form.params,
-      this.form.context,
-      this.form.data
+      this.form.context
     );
     if (!this.state.viewComponentKey) {
       this.state.viewComponentKey = createUUID3();
@@ -22763,6 +22812,12 @@ var EditFormController = class extends FormController {
     this.actionNotification("".concat(isCreate ? "CREATE" : "UPDATE", "SUCCESS"), {
       default: "".concat(this.data.srfmajortext || "", "\u4FDD\u5B58\u6210\u529F")
     });
+    if (this.view.modal.mode === "ROUTE") {
+      ibiz.mc.command.send(
+        this.data.$origin,
+        isCreate ? "OBJECTCREATED" : "OBJECTUPDATED"
+      );
+    }
     return this.data;
   }
   /**
@@ -22802,6 +22857,9 @@ var EditFormController = class extends FormController {
     this.state.modified = false;
     await this.evt.emit("onRemoveSuccess", void 0);
     this.actionNotification("REMOVESUCCESS");
+    if (this.view.modal.mode === "ROUTE") {
+      ibiz.mc.command.send(this.data.$origin, "OBJECTREMOVED");
+    }
     return ok;
   }
   /**
@@ -22840,7 +22898,7 @@ var EditFormController = class extends FormController {
       throw new RuntimeError39("\u6CA1\u627E\u5230".concat(formItemUpdateId, "\u8868\u5355\u9879\u66F4\u65B0"));
     }
     const { appDEMethodId, defiupdateDetails, customCode, scriptCode } = formItemUpdate;
-    const updateItems = defiupdateDetails.map((item) => item.id);
+    const updateItems = defiupdateDetails == null ? void 0 : defiupdateDetails.map((item) => item.id);
     let updateData;
     if (customCode && scriptCode) {
       updateData = ScriptFactory.execScriptFn(
@@ -24878,12 +24936,12 @@ var GridFieldColumnController = class extends GridColumnController {
     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 = { ...params, ...selfParams };
     return { context: _context, params: _params };
@@ -26096,13 +26154,13 @@ var PickupViewPanelController = class extends ControlController {
     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;
@@ -29363,12 +29421,12 @@ var AppUILogicExecutor = class extends LogicExecutor {
     const navContexts = openViewRef.navigateContexts || [];
     const tempContext = Object.assign(
       context,
-      convertNavData(navContexts, context, params, data[0])
+      convertNavData(navContexts, data[0], params, context)
     );
     let tempParams = {};
     const navParams = openViewRef.navigateParams;
     if (notNilEmpty8(navParams)) {
-      tempParams = convertNavData(navParams, params, context, data[0]);
+      tempParams = convertNavData(navParams, data[0], params, context);
     }
     return ibiz.commands.execute(
       OpenAppViewCommand.TAG,
@@ -29418,12 +29476,12 @@ var AppUILogicExecutor = class extends LogicExecutor {
     const _data = (data == null ? void 0 : data[0]) || {};
     const navContexts = newViewRef.navigateContexts;
     if (notNilEmpty8(navContexts)) {
-      tempContext = convertNavData(navContexts, context, params, _data);
+      tempContext = convertNavData(navContexts, _data, params, context);
     }
     tempContext = Object.assign(context, tempContext);
     const navParams = newViewRef.navigateParams;
     if (notNilEmpty8(navParams)) {
-      tempParams = convertNavData(navParams, params, context, _data);
+      tempParams = convertNavData(navParams, _data, params, context);
     }
     if (context.srfcopymode) {
       _data.srfkey = void 0;
@@ -29883,7 +29941,6 @@ export {
   contains,
   convertNavData,
   convertNavDataByArray,
-  convertNavDataByObject,
   convertObjectToNavParams,
   execDELogic,
   execDELogicAction,