@ibiz-template/runtime 0.1.7 → 0.1.8

package/dist/index.esm.js

@@ -1062,7 +1062,8 @@ async function openDERedirectView(appView, context, params = {}, opts = {}) {
   const deRdTag = "".concat(entity.name.toUpperCase(), ":").concat(rdTag);
   const allRefViews = appView.redirectAppViewRefs;
   const refView = allRefViews == null ? void 0 : allRefViews.find((view) => {
-    return view.name === deRdTag || view.name === rdTag || view.name === wfRdTag;
+    const matchKey = view.name || view.id;
+    return matchKey === deRdTag || matchKey === rdTag || matchKey === wfRdTag;
   });
   if (refView) {
     const viewId = refView.refAppViewId;
@@ -1098,6 +1099,18 @@ async function openDERedirectView(appView, context, params = {}, opts = {}) {
 }
 async function calcDERdTag(entity, rdView, params, data) {
   let rdTag = "";
+  const typeFieldId = rdView.typeAppDEFieldId;
+  if (typeFieldId) {
+    const { codeName } = findFieldById(entity, typeFieldId);
+    const value = data[codeName.toLowerCase()];
+    if (notNilEmpty2(value)) {
+      return "".concat(value);
+    }
+    ibiz.log.warn(
+      "\u91CD\u5B9A\u5411\u89C6\u56FE[".concat(rdView.name, "]\u81EA\u5B9A\u4E49\u7C7B\u522B\u5C5E\u6027[").concat(typeFieldId, "]\u503C\u4E3A\u7A7A"),
+      data
+    );
+  }
   const defView = "".concat(ibiz.env.isMob ? "MOB" : "", "EDITVIEW");
   const srfWf = params.srfwf;
   if (notNilEmpty2(srfWf)) {
@@ -1107,19 +1120,9 @@ async function calcDERdTag(entity, rdView, params, data) {
     return "".concat(defView, ":").concat(srfWf.toUpperCase());
   }
   let typeValue = "";
-  const typeFieldId = rdView.typeAppDEFieldId;
-  if (typeFieldId) {
-    const { codeName } = findFieldById(entity, typeFieldId);
-    const value = data[codeName.toLowerCase()];
-    if (notNilEmpty2(value)) {
-      typeValue = value;
-    }
-  }
-  if (isNilOrEmpty2(typeValue)) {
-    if (entity.indexTypeAppDEFieldId) {
-      const { codeName } = findFieldById(entity, entity.indexTypeAppDEFieldId);
-      typeValue = data[codeName.toLowerCase()];
-    }
+  if (entity.indexTypeAppDEFieldId) {
+    const { codeName } = findFieldById(entity, entity.indexTypeAppDEFieldId);
+    typeValue = data[codeName.toLowerCase()];
   }
   if (isNilOrEmpty2(typeValue)) {
     if (entity.formTypeAppDEFieldId) {
@@ -1251,7 +1254,10 @@ var ScriptFunction = class {
     this.options = options;
     const code = this.formatCode(scriptCode, options);
     this.calcArgKeys(argKeys, options);
-    this.scriptFn = new Function(...this.argKeys, code);
+    const fn = new Function(...this.argKeys, code);
+    this.scriptFn = function callBack(...args) {
+      return fn.apply({}, args);
+    };
   }
   /**
    * 格式化脚本
@@ -2137,6 +2143,8 @@ var SysUIActionTag = /* @__PURE__ */ ((SysUIActionTag2) => {
   SysUIActionTag2["COPY"] = "Copy";
   SysUIActionTag2["VIEW"] = "View";
   SysUIActionTag2["TOGGLE_ROW_EDIT"] = "ToggleRowEdit";
+  SysUIActionTag2["REFRESH_ALL"] = "RefreshAll";
+  SysUIActionTag2["REFRESH_PARENT"] = "RefreshParent";
   SysUIActionTag2["LOAD_MORE"] = "LoadMore";
   return SysUIActionTag2;
 })(SysUIActionTag || {});
@@ -4629,6 +4637,9 @@ var MethodDto = class _MethodDto {
           break;
         }
         case "DTOS": {
+          if (!field.refAppDataEntityId) {
+            break;
+          }
           const dto = await this.getFieldDto(field);
           const service = await this.app.deService.getService(
             field.refAppDataEntityId
@@ -4667,6 +4678,9 @@ var MethodDto = class _MethodDto {
     return Promise.all(
       data.map(async (datum) => {
         const all = this.fields.filter((field) => field.type === "DTOS").map(async (field) => {
+          if (!field.refAppDataEntityId) {
+            return;
+          }
           const key = field.codeName.toLowerCase();
           const dto = await this.getFieldDto(field);
           const items = datum[key];
@@ -6439,7 +6453,7 @@ var DEService = class {
 };
 
 // src/service/vo/control.vo.ts
-import { isNil as isNil8 } from "ramda";
+import { clone as clone10, isNil as isNil8 } from "ramda";
 var ControlVO = class _ControlVO {
   /**
    * 是否是新建数据，0为新建
@@ -6597,6 +6611,21 @@ var ControlVO = class _ControlVO {
   setOrigin(data) {
     this.$origin = data instanceof _ControlVO ? data.getOrigin() : data;
   }
+  /**
+   * 克隆新的vo数据
+   *
+   * @author lxm
+   * @date 2023-08-16 11:08:29
+   * @return {*}  {ControlVO}
+   */
+  clone() {
+    const cloneOrigin = clone10(this.$origin);
+    const newVal = new _ControlVO(cloneOrigin, this.$dataUIMap);
+    Object.keys(this).forEach((key) => {
+      newVal[key] = this[key];
+    });
+    return newVal;
+  }
 };
 
 // src/service/service/control/control.service.ts
@@ -7030,39 +7059,41 @@ var AuthorityService = class {
   }
 };
 
-// src/service/service/auth/auth.service.ts
-var AuthService = class {
-  /**
-   * v7 uaa 登录
-   *
-   * @author chitanda
-   * @date 2022-07-19 18:07:54
-   * @param {string} loginname
-   * @param {string} password
-   * @return {*}  {Promise<IHttpResponse>}
-   */
-  async v7login(loginname, password) {
-    const res = await ibiz.net.post(
-      "/v7/login",
-      { loginname, password },
-      {},
-      {
-        // sass 模式下，注册在 sassMgr 管理平台的应用中心系统标识
-        // srfdcsystem: ibiz.env.dcSystem,
+// src/service/service/auth/v7-auth.service.ts
+import { CoreConst } from "@ibiz-template/core";
+import { clearCookie, setCookie } from "qx-util";
+var V7AuthService = class {
+  async login(loginname, password) {
+    try {
+      const res = await ibiz.net.post("/v7/login", { loginname, password });
+      const { data } = res;
+      if (data && data.token) {
+        setCookie(CoreConst.TOKEN, data.token, 0, true);
+        const expiredDate = (/* @__PURE__ */ new Date()).getTime() + (data.expirein || 7199) * 1e3;
+        setCookie(CoreConst.TOKEN_EXPIRES, "".concat(expiredDate), 0, true);
       }
-    );
-    return res;
+      return true;
+    } catch (err) {
+      ibiz.notification.error({
+        title: "\u767B\u5F55\u5931\u8D25",
+        desc: err.message || ""
+      });
+    }
+    return false;
   }
-  /**
-   * v7 uaa 登出
-   *
-   * @author chitanda
-   * @date 2022-09-14 18:07:54
-   * @return {*}  {Promise<IHttpResponse>}
-   */
-  async v7logout() {
-    const res = await ibiz.net.get("/v7/logout", {});
-    return res;
+  async logout() {
+    try {
+      await ibiz.net.get("/v7/logout");
+      clearCookie(CoreConst.TOKEN);
+      clearCookie(CoreConst.TOKEN_EXPIRES);
+      return true;
+    } catch (err) {
+      ibiz.notification.error({
+        title: "\u767B\u51FA\u5931\u8D25",
+        desc: err.message || ""
+      });
+    }
+    return false;
   }
 };
 
@@ -7083,6 +7114,27 @@ var TreeNodeData = class {
     }
     this.nodeId = model.id;
   }
+  /**
+   * 计算节点图标
+   * @author lxm
+   * @date 2023-08-15 02:24:55
+   * @protected
+   * @param {IDETreeNode} model
+   * @return {*}  {(IIcon | undefined)}
+   */
+  calcIcon(model) {
+    const { sysImage } = model;
+    const icon = {};
+    if (sysImage) {
+      if (sysImage.cssClass) {
+        icon.cssClass = sysImage.cssClass;
+      }
+      if (sysImage.imagePath) {
+        icon.imagePath = sysImage.imagePath;
+      }
+    }
+    return Object.values(icon).length > 0 ? icon : void 0;
+  }
 };
 
 // src/service/vo/tree-node-data/tree-code-list-node-data.ts
@@ -7103,6 +7155,7 @@ var TreeCodeListNodeData = class extends TreeNodeData {
     }
     this.srfkey = this.value;
     this.srfmajortext = this.text;
+    this.icon = this.calcIcon(model);
   }
 };
 
@@ -7124,6 +7177,56 @@ var TreeDataSetNodeData = class extends TreeNodeData {
     }
     this.srfkey = this.deData.srfkey;
     this.srfmajortext = this.deData.srfmajortext;
+    this.icon = this.calcIcon(model);
+    this.textHtml = this.calcTextHtml(model);
+  }
+  calcIcon(model) {
+    const icon = super.calcIcon(model) || {};
+    const { iconAppDEFieldId, detreeNodeDataItems } = model;
+    if (iconAppDEFieldId && this.deData[iconAppDEFieldId]) {
+      icon.imagePath = this.deData[iconAppDEFieldId];
+    }
+    if (icon) {
+      this.icon = icon;
+    }
+    const iconDataItem = detreeNodeDataItems == null ? void 0 : detreeNodeDataItems.find((item) => item.id === "icon");
+    if (iconDataItem) {
+      icon.htmlStr = this.calcDataItemScript(iconDataItem);
+    }
+    return Object.values(icon).length > 0 ? icon : void 0;
+  }
+  /**
+   * 计算节点数据项的自定义脚本内容
+   * @author lxm
+   * @date 2023-08-15 02:37:29
+   * @protected
+   * @param {IDETreeNodeDataItem} dataItem
+   * @return {*}  {(string | undefined)}
+   */
+  calcDataItemScript(dataItem) {
+    if (dataItem.customCode && dataItem.scriptCode) {
+      return ScriptFactory.execScriptFn(
+        { data: this.deData },
+        dataItem.scriptCode
+      );
+    }
+  }
+  /**
+   * 计算节点文本html内容
+   * @author lxm
+   * @date 2023-08-15 02:41:31
+   * @protected
+   * @param {IDETreeDataSetNode} model
+   * @return {*}  {(string | undefined)}
+   */
+  calcTextHtml(model) {
+    let html;
+    const { detreeNodeDataItems } = model;
+    const textDataItem = detreeNodeDataItems == null ? void 0 : detreeNodeDataItems.find((item) => item.id === "text");
+    if (textDataItem) {
+      html = this.calcDataItemScript(textDataItem);
+    }
+    return html;
   }
 };
 
@@ -7149,6 +7252,7 @@ var TreeStaticNodeData = class extends TreeNodeData {
     }
     this.srfkey = ((_a = this.deData) == null ? void 0 : _a.srfkey) || this.value;
     this.srfmajortext = ((_b = this.deData) == null ? void 0 : _b.srfmajortext) || this.text;
+    this.icon = this.calcIcon(model);
   }
 };
 
@@ -8199,11 +8303,11 @@ var MDViewEngine = class extends ViewEngineBase {
       return null;
     }
     if (key === "Edit" /* EDIT */ || key === "View" /* VIEW */) {
-      this.openData(args);
+      await this.openData(args);
       return null;
     }
     if (key === "New" /* NEW */) {
-      this.newData(args);
+      await this.newData(args);
       return null;
     }
     if (key === "Remove" /* REMOVE */) {
@@ -8333,9 +8437,18 @@ var MDViewEngine = class extends ViewEngineBase {
     const params = {};
     if (this.searchForm) {
       const addParams = this.searchForm.getData()[0];
-      Object.assign(params, addParams);
+      const filteredParams = Object.entries(addParams).reduce(
+        (result, [key, value]) => {
+          if (value !== null && value !== void 0 && value !== "") {
+            result[key] = value;
+          }
+          return result;
+        },
+        {}
+      );
+      Object.assign(params, filteredParams);
     }
-    if (this.searchBar) {
+    if (this.searchBar && this.searchBar.state.query) {
       const addParams = {
         query: this.searchBar.state.query
       };
@@ -8457,7 +8570,7 @@ function getProvider2(key) {
 }
 async function getEditorProvider(model) {
   let provider;
-  const { editorType, editorStyle } = model;
+  const { editorType, editorStyle, predefinedType } = model;
   if (editorStyle && editorStyle !== "DEFAULT") {
     const key = "".concat(editorType, "_").concat(editorStyle);
     provider = getProvider2(key);
@@ -8468,6 +8581,19 @@ async function getEditorProvider(model) {
       );
     }
   }
+  if (predefinedType) {
+    let key = "".concat(predefinedType, "_").concat(editorType);
+    if (editorStyle && editorStyle !== "DEFAULT") {
+      key += "_".concat(editorStyle);
+    }
+    provider = getProvider2(key);
+    if (!provider) {
+      ibiz.log.error(
+        "\u627E\u4E0D\u5230\u7F16\u8F91\u5668\u7C7B\u578B\uFF1A[".concat(editorType, "]\u7684\u9884\u7F6E\u7C7B\u578B\uFF1A[").concat(predefinedType, "]\u5BF9\u5E94\u7684\u9002\u914D\u5668"),
+        model
+      );
+    }
+  }
   if (!provider) {
     provider = getProvider2(editorType);
   }
@@ -9086,7 +9212,7 @@ import { ModelError as ModelError20 } from "@ibiz-template/core";
 
 // src/ui-logic/utils/handle-src-val.ts
 import { ModelError as ModelError19 } from "@ibiz-template/core";
-import { clone as clone10 } from "ramda";
+import { clone as clone11 } from "ramda";
 function handleSrcVal2(ctx, srcValParams) {
   const { srcDEUILogicParamId, srcFieldName, srcValue } = srcValParams;
   const srcValueType = srcValParams.srcValueType || "SRCDLPARAM";
@@ -9108,7 +9234,7 @@ function handleSrcVal2(ctx, srcValParams) {
       value = ctx.context;
       break;
     case "ENVPARAM":
-      value = clone10(ibiz.env);
+      value = clone11(ibiz.env);
       break;
     default:
       throw new ModelError19(srcValParams, "\u6682\u672A\u652F\u6301\u6E90\u503C\u7C7B\u578B".concat(srcValueType));
@@ -10739,7 +10865,7 @@ function install() {
   ibiz2.hub = new AppHub();
   ibiz2.register = new RegisterCenter();
   ibiz2.config = new GlobalConfig();
-  ibiz2.auth = new AuthService();
+  ibiz2.auth = new V7AuthService();
   ibiz2.engine = new EngineFactory();
   installCommand();
   presetUIActionProvider();
@@ -12299,8 +12425,13 @@ var MDControlController = class extends ControlController {
     this.state.mdctrlActiveMode = 0;
     this.state.groups = [];
   }
+  async onCreated() {
+    await super.onCreated();
+    this.setSort();
+  }
   /**
    * 设置排序
+   * 无参数时设置的是默认排序。
    *
    * @author lxm
    * @date 2022-09-28 13:09:44
@@ -12308,7 +12439,9 @@ var MDControlController = class extends ControlController {
    * @param {string} order 排序顺序
    */
   setSort(key, order) {
-    this.state.sortQuery = "".concat(key, ",").concat(order);
+    if (key && order) {
+      this.state.sortQuery = "".concat(key, ",").concat(order);
+    }
   }
   /**
    * 获取请求过滤参数（整合了视图参数，各种过滤条件，排序，分页）
@@ -12407,14 +12540,17 @@ var MDControlController = class extends ControlController {
     if (!(data == null ? void 0 : data.length)) {
       throw new RuntimeError31("\u672A\u9009\u4E2D\u6570\u636E");
     }
-    const del = await ibiz.confirm.error({
-      title: "\u6570\u636E\u5220\u9664",
-      desc: "\u786E\u8BA4\u5220\u9664\u6570\u636E\uFF1F"
-    });
-    if (!del) {
-      return;
+    if ((args == null ? void 0 : args.silent) !== true) {
+      const del = await ibiz.confirm.error({
+        title: "\u6570\u636E\u5220\u9664",
+        desc: "\u786E\u8BA4\u5220\u9664\u6570\u636E\uFF1F"
+      });
+      if (!del) {
+        return;
+      }
     }
     await this.startLoading();
+    let needRefresh = false;
     try {
       const deName = calcDeCodeNameById(this.model.appDataEntityId);
       await Promise.allSettled(
@@ -12423,14 +12559,19 @@ var MDControlController = class extends ControlController {
             const tempContext = context.clone();
             tempContext[deName] = item.srfkey;
             await this.service.remove(tempContext, params);
+            needRefresh = true;
           }
           this.afterRemove(data);
         })
       );
-      ibiz.notification.success({
-        desc: "\u6570\u636E[".concat(data.map((item) => item.srfmajortext).join("\u3001"), "]\u5220\u9664\u6210\u529F!")
-      });
-      this.refresh();
+      if ((args == null ? void 0 : args.silent) !== true) {
+        ibiz.notification.success({
+          desc: "\u6570\u636E[".concat(data.map((item) => item.srfmajortext).join("\u3001"), "]\u5220\u9664\u6210\u529F!")
+        });
+      }
+      if (needRefresh) {
+        this.refresh();
+      }
     } finally {
       await this.endLoading();
     }
@@ -12532,7 +12673,6 @@ export {
   AppDataEntity,
   AppFuncCommand,
   Application,
-  AuthService,
   AuthorityService,
   BackendUIActionProvider,
   BaseController,
@@ -12598,6 +12738,7 @@ export {
   UIActionButtonState,
   UIActionUtil,
   UIMapField,
+  V7AuthService,
   VIEW_PROVIDER_PREFIX,
   ViewController,
   ViewEngineBase,