@ibiz-template/model-helper 0.5.1 → 0.5.2

package/dist/index.esm.js

@@ -4451,8 +4451,8 @@ function deepUpdateAppId(appId, model) {
     });
   } else {
     model.appId = appId;
-    const keys = Object.keys(model);
-    keys.forEach((key) => {
+    const keys4 = Object.keys(model);
+    keys4.forEach((key) => {
       const val = model[key];
       deepUpdateAppId(appId, val);
     });
@@ -15114,15 +15114,6 @@ var DSLHelper = class {
   }
 };
 
-// src/utils/format-path/format-path.ts
-function formatPath(path) {
-  if ((path == null ? void 0 : path.indexOf("PSSYSAPPS/")) === 0) {
-    const pos = path.indexOf("/");
-    return path.substring(path.indexOf("/", pos + 1));
-  }
-  return path;
-}
-
 // ../../node_modules/.pnpm/ramda@0.29.1/node_modules/ramda/es/internal/_isPlaceholder.js
 function _isPlaceholder(a) {
   return a != null && typeof a === "object" && a["@@functional/placeholder"] === true;
@@ -15195,16 +15186,266 @@ function _curry3(fn) {
   };
 }
 
+// ../../node_modules/.pnpm/ramda@0.29.1/node_modules/ramda/es/internal/_isArray.js
+var isArray_default = Array.isArray || function _isArray(val) {
+  return val != null && val.length >= 0 && Object.prototype.toString.call(val) === "[object Array]";
+};
+
+// ../../node_modules/.pnpm/ramda@0.29.1/node_modules/ramda/es/internal/_arrayFromIterator.js
+function _arrayFromIterator(iter) {
+  var list = [];
+  var next;
+  while (!(next = iter.next()).done) {
+    list.push(next.value);
+  }
+  return list;
+}
+
+// ../../node_modules/.pnpm/ramda@0.29.1/node_modules/ramda/es/internal/_includesWith.js
+function _includesWith(pred, x, list) {
+  var idx = 0;
+  var len = list.length;
+  while (idx < len) {
+    if (pred(x, list[idx])) {
+      return true;
+    }
+    idx += 1;
+  }
+  return false;
+}
+
+// ../../node_modules/.pnpm/ramda@0.29.1/node_modules/ramda/es/internal/_functionName.js
+function _functionName(f) {
+  var match = String(f).match(/^function (\w*)/);
+  return match == null ? "" : match[1];
+}
+
 // ../../node_modules/.pnpm/ramda@0.29.1/node_modules/ramda/es/internal/_has.js
 function _has(prop, obj) {
   return Object.prototype.hasOwnProperty.call(obj, prop);
 }
 
+// ../../node_modules/.pnpm/ramda@0.29.1/node_modules/ramda/es/internal/_objectIs.js
+function _objectIs(a, b) {
+  if (a === b) {
+    return a !== 0 || 1 / a === 1 / b;
+  } else {
+    return a !== a && b !== b;
+  }
+}
+var objectIs_default = typeof Object.is === "function" ? Object.is : _objectIs;
+
+// ../../node_modules/.pnpm/ramda@0.29.1/node_modules/ramda/es/internal/_isArguments.js
+var toString = Object.prototype.toString;
+var _isArguments = /* @__PURE__ */ function() {
+  return toString.call(arguments) === "[object Arguments]" ? function _isArguments2(x) {
+    return toString.call(x) === "[object Arguments]";
+  } : function _isArguments2(x) {
+    return _has("callee", x);
+  };
+}();
+var isArguments_default = _isArguments;
+
+// ../../node_modules/.pnpm/ramda@0.29.1/node_modules/ramda/es/keys.js
+var hasEnumBug = !/* @__PURE__ */ {
+  toString: null
+}.propertyIsEnumerable("toString");
+var nonEnumerableProps = ["constructor", "valueOf", "isPrototypeOf", "toString", "propertyIsEnumerable", "hasOwnProperty", "toLocaleString"];
+var hasArgsEnumBug = /* @__PURE__ */ function() {
+  "use strict";
+  return arguments.propertyIsEnumerable("length");
+}();
+var contains = function contains2(list, item) {
+  var idx = 0;
+  while (idx < list.length) {
+    if (list[idx] === item) {
+      return true;
+    }
+    idx += 1;
+  }
+  return false;
+};
+var keys = typeof Object.keys === "function" && !hasArgsEnumBug ? /* @__PURE__ */ _curry1(function keys2(obj) {
+  return Object(obj) !== obj ? [] : Object.keys(obj);
+}) : /* @__PURE__ */ _curry1(function keys3(obj) {
+  if (Object(obj) !== obj) {
+    return [];
+  }
+  var prop, nIdx;
+  var ks = [];
+  var checkArgsLength = hasArgsEnumBug && isArguments_default(obj);
+  for (prop in obj) {
+    if (_has(prop, obj) && (!checkArgsLength || prop !== "length")) {
+      ks[ks.length] = prop;
+    }
+  }
+  if (hasEnumBug) {
+    nIdx = nonEnumerableProps.length - 1;
+    while (nIdx >= 0) {
+      prop = nonEnumerableProps[nIdx];
+      if (_has(prop, obj) && !contains(ks, prop)) {
+        ks[ks.length] = prop;
+      }
+      nIdx -= 1;
+    }
+  }
+  return ks;
+});
+var keys_default = keys;
+
+// ../../node_modules/.pnpm/ramda@0.29.1/node_modules/ramda/es/type.js
+var type = /* @__PURE__ */ _curry1(function type2(val) {
+  return val === null ? "Null" : val === void 0 ? "Undefined" : Object.prototype.toString.call(val).slice(8, -1);
+});
+var type_default = type;
+
+// ../../node_modules/.pnpm/ramda@0.29.1/node_modules/ramda/es/internal/_equals.js
+function _uniqContentEquals(aIterator, bIterator, stackA, stackB) {
+  var a = _arrayFromIterator(aIterator);
+  var b = _arrayFromIterator(bIterator);
+  function eq(_a, _b) {
+    return _equals(_a, _b, stackA.slice(), stackB.slice());
+  }
+  return !_includesWith(function(b2, aItem) {
+    return !_includesWith(eq, aItem, b2);
+  }, b, a);
+}
+function _equals(a, b, stackA, stackB) {
+  if (objectIs_default(a, b)) {
+    return true;
+  }
+  var typeA = type_default(a);
+  if (typeA !== type_default(b)) {
+    return false;
+  }
+  if (typeof a["fantasy-land/equals"] === "function" || typeof b["fantasy-land/equals"] === "function") {
+    return typeof a["fantasy-land/equals"] === "function" && a["fantasy-land/equals"](b) && typeof b["fantasy-land/equals"] === "function" && b["fantasy-land/equals"](a);
+  }
+  if (typeof a.equals === "function" || typeof b.equals === "function") {
+    return typeof a.equals === "function" && a.equals(b) && typeof b.equals === "function" && b.equals(a);
+  }
+  switch (typeA) {
+    case "Arguments":
+    case "Array":
+    case "Object":
+      if (typeof a.constructor === "function" && _functionName(a.constructor) === "Promise") {
+        return a === b;
+      }
+      break;
+    case "Boolean":
+    case "Number":
+    case "String":
+      if (!(typeof a === typeof b && objectIs_default(a.valueOf(), b.valueOf()))) {
+        return false;
+      }
+      break;
+    case "Date":
+      if (!objectIs_default(a.valueOf(), b.valueOf())) {
+        return false;
+      }
+      break;
+    case "Error":
+      return a.name === b.name && a.message === b.message;
+    case "RegExp":
+      if (!(a.source === b.source && a.global === b.global && a.ignoreCase === b.ignoreCase && a.multiline === b.multiline && a.sticky === b.sticky && a.unicode === b.unicode)) {
+        return false;
+      }
+      break;
+  }
+  var idx = stackA.length - 1;
+  while (idx >= 0) {
+    if (stackA[idx] === a) {
+      return stackB[idx] === b;
+    }
+    idx -= 1;
+  }
+  switch (typeA) {
+    case "Map":
+      if (a.size !== b.size) {
+        return false;
+      }
+      return _uniqContentEquals(a.entries(), b.entries(), stackA.concat([a]), stackB.concat([b]));
+    case "Set":
+      if (a.size !== b.size) {
+        return false;
+      }
+      return _uniqContentEquals(a.values(), b.values(), stackA.concat([a]), stackB.concat([b]));
+    case "Arguments":
+    case "Array":
+    case "Object":
+    case "Boolean":
+    case "Number":
+    case "String":
+    case "Date":
+    case "Error":
+    case "RegExp":
+    case "Int8Array":
+    case "Uint8Array":
+    case "Uint8ClampedArray":
+    case "Int16Array":
+    case "Uint16Array":
+    case "Int32Array":
+    case "Uint32Array":
+    case "Float32Array":
+    case "Float64Array":
+    case "ArrayBuffer":
+      break;
+    default:
+      return false;
+  }
+  var keysA = keys_default(a);
+  if (keysA.length !== keys_default(b).length) {
+    return false;
+  }
+  var extendedStackA = stackA.concat([a]);
+  var extendedStackB = stackB.concat([b]);
+  idx = keysA.length - 1;
+  while (idx >= 0) {
+    var key = keysA[idx];
+    if (!(_has(key, b) && _equals(b[key], a[key], extendedStackA, extendedStackB))) {
+      return false;
+    }
+    idx -= 1;
+  }
+  return true;
+}
+
+// ../../node_modules/.pnpm/ramda@0.29.1/node_modules/ramda/es/equals.js
+var equals = /* @__PURE__ */ _curry2(function equals2(a, b) {
+  return _equals(a, b, [], []);
+});
+var equals_default = equals;
+
 // ../../node_modules/.pnpm/ramda@0.29.1/node_modules/ramda/es/internal/_isObject.js
 function _isObject(x) {
   return Object.prototype.toString.call(x) === "[object Object]";
 }
 
+// ../../node_modules/.pnpm/ramda@0.29.1/node_modules/ramda/es/internal/_isString.js
+function _isString(x) {
+  return Object.prototype.toString.call(x) === "[object String]";
+}
+
+// ../../node_modules/.pnpm/ramda@0.29.1/node_modules/ramda/es/internal/_isTypedArray.js
+function _isTypedArray(val) {
+  var type3 = Object.prototype.toString.call(val);
+  return type3 === "[object Uint8ClampedArray]" || type3 === "[object Int8Array]" || type3 === "[object Uint8Array]" || type3 === "[object Int16Array]" || type3 === "[object Uint16Array]" || type3 === "[object Int32Array]" || type3 === "[object Uint32Array]" || type3 === "[object Float32Array]" || type3 === "[object Float64Array]" || type3 === "[object BigInt64Array]" || type3 === "[object BigUint64Array]";
+}
+
+// ../../node_modules/.pnpm/ramda@0.29.1/node_modules/ramda/es/empty.js
+var empty = /* @__PURE__ */ _curry1(function empty2(x) {
+  return x != null && typeof x["fantasy-land/empty"] === "function" ? x["fantasy-land/empty"]() : x != null && x.constructor != null && typeof x.constructor["fantasy-land/empty"] === "function" ? x.constructor["fantasy-land/empty"]() : x != null && typeof x.empty === "function" ? x.empty() : x != null && x.constructor != null && typeof x.constructor.empty === "function" ? x.constructor.empty() : isArray_default(x) ? [] : _isString(x) ? "" : _isObject(x) ? {} : isArguments_default(x) ? /* @__PURE__ */ function() {
+    return arguments;
+  }() : _isTypedArray(x) ? x.constructor.from("") : void 0;
+});
+var empty_default = empty;
+
+// ../../node_modules/.pnpm/ramda@0.29.1/node_modules/ramda/es/isEmpty.js
+var isEmpty = /* @__PURE__ */ _curry1(function isEmpty2(x) {
+  return x != null && equals_default(x, empty_default(x));
+});
+var isEmpty_default = isEmpty;
+
 // ../../node_modules/.pnpm/ramda@0.29.1/node_modules/ramda/es/mergeWithKey.js
 var mergeWithKey = /* @__PURE__ */ _curry3(function mergeWithKey2(fn, l, r) {
   var result = {};
@@ -15245,6 +15486,15 @@ var mergeDeepLeft = /* @__PURE__ */ _curry2(function mergeDeepLeft2(lObj, rObj)
 });
 var mergeDeepLeft_default = mergeDeepLeft;
 
+// src/utils/format-path/format-path.ts
+function formatPath(path) {
+  if ((path == null ? void 0 : path.indexOf("PSSYSAPPS/")) === 0) {
+    const pos = path.indexOf("/");
+    return path.substring(path.indexOf("/", pos + 1));
+  }
+  return path;
+}
+
 // src/utils/merge-model/merge-model.ts
 function mergeModel(models, m, tag) {
   models.forEach((model) => {
@@ -15531,7 +15781,7 @@ var ModelUtil = class {
    * @date 2023-04-13 21:04:21
    * @param {string}appId 应用标识
    * @param {string} modelTag
-   * @param {(url: string) => Promise<IModel>} get 模型加载方法
+   * @param {(url: string, params?: IParams) => Promise<IModel>} get 模型加载方法
    * @param {boolean} hub 是否为 hub 应用基座
    */
   constructor(appId, modelTag, get, hub, permission = true) {
@@ -15704,15 +15954,15 @@ var ModelUtil = class {
     throw new Error("\u5E94\u7528[".concat(this.appId, "]\u672A\u627E\u5230\u6570\u636E\u5B9E\u4F53[").concat(tag, "]"));
   }
   /**
-   * 根据应用视图 codeName 获取应用视图模型
+   * 根据应用视图 id 获取应用视图模型,如果给了 params 则每次都会重新加载模型
    *
    * @author chitanda
-   * @date 2023-04-16 18:04:00
+   * @date 2024-01-08 11:01:39
    * @param {string} tag
-   * @param {boolean} [ignoreCase=false]
+   * @param {IParams} [params]
    * @return {*}  {Promise<IModel>}
    */
-  async getAppViewModel(tag) {
+  async getAppViewModel(tag, params) {
     const allViews = this.appModel.getAllPSAppViews;
     if (allViews && allViews.length > 0) {
       const lowerTag = tag.toLowerCase();
@@ -15721,7 +15971,7 @@ var ModelUtil = class {
         (v) => v.id.endsWith(exTag) || v.id === lowerTag
       );
       if (view) {
-        return this.getModel(view.path);
+        return this.getModel(view.path, params);
       }
     }
     throw new Error("\u5E94\u7528[".concat(this.appId, "]\u672A\u627E\u5230\u89C6\u56FE[").concat(tag, "]"));
@@ -15764,25 +16014,29 @@ var ModelUtil = class {
     return this.get(url);
   }
   /**
-   * 获取模型
+   * 加载模型，如果给了 params 则不会缓存模型
    *
    * @author chitanda
-   * @date 2023-04-16 16:04:10
+   * @date 2024-01-08 11:01:41
    * @param {string} modelPath
+   * @param {IParams} [params]
    * @return {*}  {Promise<IModel>}
    */
-  async getModel(modelPath) {
+  async getModel(modelPath, params) {
     let url;
     if (this.hub) {
       url = this.calcAppPath(modelPath);
     } else {
       url = this.calcSubAppPath(modelPath);
     }
-    if (this.modelCache.has(url)) {
+    const isParams = params && !isEmpty_default(params);
+    if (this.modelCache.has(url) && !isParams) {
       return this.modelCache.get(url);
     }
-    const model = await this.get(url);
-    this.modelCache.set(url, model);
+    const model = await this.get(url, params);
+    if (!isParams) {
+      this.modelCache.set(url, model);
+    }
     this.deepFillAppId(model);
     return model;
   }
@@ -15796,8 +16050,8 @@ var ModelUtil = class {
    */
   deepFillAppId(model) {
     model.appId = this.appId;
-    const keys = Object.keys(model);
-    keys.forEach((key) => {
+    const keys4 = Object.keys(model);
+    keys4.forEach((key) => {
       const value = model[key];
       if (value && typeof value === "object") {
         if (Array.isArray(value)) {
@@ -15861,6 +16115,9 @@ var ModelLoader = class {
   getAppStyle(appId) {
     return this.helper.getAppStyle(appId);
   }
+  loadAppView(appId, viewId, params) {
+    return this.helper.loadAppViewModel(viewId, params, appId);
+  }
 };
 
 // src/model-helper.ts
@@ -15868,8 +16125,8 @@ var ModelHelper = class {
   /**
    * Creates an instance of ModelHelper.
    * @author chitanda
-   * @date 2023-04-16 17:04:01
-   * @param {(url: string) => Promise<IModel>} getModel 模型加载方法
+   * @date 2024-01-08 10:01:20
+   * @param {(url: string, params?: IParams) => Promise<IModel>} getModel 模型加载方法
    * @param {string} defaultAppId 默认应用标识
    * @param {boolean} [permission=true] 是否启用权限
    */
@@ -16086,6 +16343,24 @@ var ModelHelper = class {
     this.calcAppViewSubAppModel(dsl);
     return dsl;
   }
+  /**
+   * 根据路径和参数加载应用视图模型，主要用于后台根据运行时参数重新计算视图模型
+   *
+   * @author chitanda
+   * @date 2024-01-08 10:01:43
+   * @param {string} viewId
+   * @param {IParams} [params]
+   * @param {string} [appId]
+   * @return {*}  {Promise<IAppView>}
+   */
+  async loadAppViewModel(viewId, params, appId) {
+    const model = await this.getModelUtil(appId).getAppViewModel(
+      viewId,
+      params
+    );
+    const dsl = this.dsl.appView(model);
+    return dsl;
+  }
   /**
    * 获取应用多语言模型
    *