@ibiz-template/runtime 0.7.17 → 0.7.18

package/dist/index.esm.js

@@ -5064,10 +5064,12 @@ var AnimeUtil = class {
 
 // src/utils/file-util/file-util.ts
 import {
+  CoreConst,
   RuntimeError as RuntimeError5,
   downloadFileFromBlob
 } from "@ibiz-template/core";
 import qs2 from "qs";
+import { getCookie } from "qx-util";
 var FileUtil = class {
   /**
    * 计算OSSCat参数
@@ -5207,6 +5209,55 @@ var FileUtil = class {
     }
     return fileName;
   }
+  /**
+   * 选择文件并上传
+   *
+   * @param {IContext} context
+   * @param {IParams} params
+   * @param {IData} data
+   * @param {IData} [option={}]
+   * @return {*}  {Promise<IData[]>}
+   * @memberof FileUtil
+   */
+  async chooseFileAndUpload(context, params, data, option = {}) {
+    const { accept, multiple } = option;
+    const urls = ibiz.util.file.calcFileUpDownUrl(context, params, data);
+    const files = await ibiz.util.file.chooseFile(accept, multiple);
+    const promises = [];
+    const headers = { Authorization: "Bearer ".concat(getCookie(CoreConst.TOKEN)) };
+    for (let i = 0; i < files.length; i++) {
+      const promise = await ibiz.util.file.fileUpload(
+        urls.uploadUrl,
+        files[i],
+        headers
+      );
+      promises.push(promise);
+    }
+    return Promise.all(promises);
+  }
+  /**
+   * 选择文件
+   *
+   * @param {string} [accept='']
+   * @param {boolean} [multiple=false]
+   * @return {*}  {Promise<FileList>}
+   * @memberof FileUtil
+   */
+  chooseFile(accept = "", multiple = false) {
+    return new Promise((resolve) => {
+      const inputElement = document.createElement("input");
+      inputElement.type = "file";
+      inputElement.accept = accept;
+      inputElement.multiple = multiple;
+      inputElement.webkitdirectory = false;
+      inputElement.addEventListener("change", (e) => {
+        resolve(e.target.files);
+      });
+      document.body.appendChild(inputElement);
+      inputElement.click();
+      document.body.removeChild(inputElement);
+    });
+  }
 };
 
 // src/utils/short-cut/short-cut-util.ts
@@ -11947,11 +11998,11 @@ var AuthorityService = class {
 };
 
 // src/service/service/auth/v7-auth.service.ts
-import { CoreConst } from "@ibiz-template/core";
-import { clearCookie, getCookie, setCookie } from "qx-util";
+import { CoreConst as CoreConst2 } from "@ibiz-template/core";
+import { clearCookie, getCookie as getCookie2, setCookie } from "qx-util";
 var V7AuthService = class {
   get isAnonymous() {
-    return getCookie(CoreConst.IS_ANONYMOUS) === "1";
+    return getCookie2(CoreConst2.IS_ANONYMOUS) === "1";
   }
   /**
    * 使用匿名账号登录
@@ -11968,16 +12019,16 @@ var V7AuthService = class {
     }
     const result = await this.login(anonymousUser, anonymousPwd);
     if (result) {
-      setCookie(CoreConst.IS_ANONYMOUS, "1", 0, true);
-      const token = getCookie(CoreConst.TOKEN);
-      const expirein = getCookie(CoreConst.TOKEN_EXPIRES);
-      const remember = getCookie(CoreConst.TOKEN_REMEMBER);
-      const refreshToken = getCookie(CoreConst.REFRESH_TOKEN);
-      setCookie(CoreConst.TOKEN, token, 0, true);
-      setCookie(CoreConst.TOKEN_EXPIRES, expirein, 0, true);
-      setCookie(CoreConst.TOKEN_REMEMBER, remember, 0, true);
+      setCookie(CoreConst2.IS_ANONYMOUS, "1", 0, true);
+      const token = getCookie2(CoreConst2.TOKEN);
+      const expirein = getCookie2(CoreConst2.TOKEN_EXPIRES);
+      const remember = getCookie2(CoreConst2.TOKEN_REMEMBER);
+      const refreshToken = getCookie2(CoreConst2.REFRESH_TOKEN);
+      setCookie(CoreConst2.TOKEN, token, 0, true);
+      setCookie(CoreConst2.TOKEN_EXPIRES, expirein, 0, true);
+      setCookie(CoreConst2.TOKEN_REMEMBER, remember, 0, true);
       if (refreshToken) {
-        setCookie(CoreConst.REFRESH_TOKEN, refreshToken, 0, true);
+        setCookie(CoreConst2.REFRESH_TOKEN, refreshToken, 0, true);
       }
     }
     return result;
@@ -12010,20 +12061,20 @@ var V7AuthService = class {
       if (data && data.token) {
         const cacheDay = remember ? 30 : 0;
         if (remember) {
-          setCookie(CoreConst.TOKEN_REMEMBER, "1", cacheDay, true);
+          setCookie(CoreConst2.TOKEN_REMEMBER, "1", cacheDay, true);
         }
-        setCookie(CoreConst.TOKEN, data.token, cacheDay, true);
+        setCookie(CoreConst2.TOKEN, data.token, cacheDay, true);
         const expiredDate = (/* @__PURE__ */ new Date()).getTime() + (data.expirein || 7199) * 1e3;
-        setCookie(CoreConst.TOKEN_EXPIRES, "".concat(expiredDate), cacheDay, true);
+        setCookie(CoreConst2.TOKEN_EXPIRES, "".concat(expiredDate), cacheDay, true);
         if (data.refresh_token) {
           setCookie(
-            CoreConst.REFRESH_TOKEN,
+            CoreConst2.REFRESH_TOKEN,
             data.refresh_token,
             cacheDay,
             true
           );
         }
-        clearCookie(CoreConst.IS_ANONYMOUS);
+        clearCookie(CoreConst2.IS_ANONYMOUS);
       }
       return true;
     } catch (err) {
@@ -12085,15 +12136,15 @@ var V7AuthService = class {
     if (this.isAnonymous) {
       return;
     }
-    const token = getCookie(CoreConst.TOKEN);
-    const expirein = getCookie(CoreConst.TOKEN_EXPIRES);
+    const token = getCookie2(CoreConst2.TOKEN);
+    const expirein = getCookie2(CoreConst2.TOKEN_EXPIRES);
     if (token && expirein) {
       let wait = Number(expirein) - (/* @__PURE__ */ new Date()).getTime();
       const early = 5 * 60 * 1e3;
       wait = wait > early ? wait - early : 0;
       setTimeout(async () => {
-        const remember = getCookie(CoreConst.TOKEN_REMEMBER);
-        const refreshToken = getCookie(CoreConst.REFRESH_TOKEN);
+        const remember = getCookie2(CoreConst2.TOKEN_REMEMBER);
+        const refreshToken = getCookie2(CoreConst2.REFRESH_TOKEN);
         const cacheDay = remember ? 30 : 0;
         let res;
         if (refreshToken != null && refreshToken !== "") {
@@ -12103,14 +12154,14 @@ var V7AuthService = class {
         }
         if (res.ok) {
           if (remember) {
-            setCookie(CoreConst.TOKEN_REMEMBER, "1", cacheDay, true);
+            setCookie(CoreConst2.TOKEN_REMEMBER, "1", cacheDay, true);
           }
-          setCookie(CoreConst.TOKEN, res.data.token, cacheDay, true);
+          setCookie(CoreConst2.TOKEN, res.data.token, cacheDay, true);
           const expiredDate = (/* @__PURE__ */ new Date()).getTime() + (res.data.expirein || 7199) * 1e3;
-          setCookie(CoreConst.TOKEN_EXPIRES, "".concat(expiredDate), cacheDay, true);
+          setCookie(CoreConst2.TOKEN_EXPIRES, "".concat(expiredDate), cacheDay, true);
           if (res.data.refresh_token) {
             setCookie(
-              CoreConst.REFRESH_TOKEN,
+              CoreConst2.REFRESH_TOKEN,
               res.data.refresh_token,
               cacheDay,
               true
@@ -12133,27 +12184,27 @@ var V7AuthService = class {
    * @return {*}  {Promise<void>}
    */
   async refreshToken() {
-    const remember = getCookie(CoreConst.TOKEN_REMEMBER);
-    const refreshToken = getCookie(CoreConst.REFRESH_TOKEN);
+    const remember = getCookie2(CoreConst2.TOKEN_REMEMBER);
+    const refreshToken = getCookie2(CoreConst2.REFRESH_TOKEN);
     if (refreshToken != null && refreshToken !== "") {
       const res = await ibiz.net.get("/uaa/refresh_token/".concat(refreshToken));
       if (res.ok) {
         const cacheDay = remember ? 30 : 0;
         if (remember) {
-          setCookie(CoreConst.TOKEN_REMEMBER, "1", cacheDay, true);
+          setCookie(CoreConst2.TOKEN_REMEMBER, "1", cacheDay, true);
         }
-        setCookie(CoreConst.TOKEN, res.data.token, cacheDay, true);
+        setCookie(CoreConst2.TOKEN, res.data.token, cacheDay, true);
         const expiredDate = (/* @__PURE__ */ new Date()).getTime() + (res.data.expirein || 7199) * 1e3;
-        setCookie(CoreConst.TOKEN_EXPIRES, "".concat(expiredDate), cacheDay, true);
+        setCookie(CoreConst2.TOKEN_EXPIRES, "".concat(expiredDate), cacheDay, true);
         if (res.data.refresh_token) {
           setCookie(
-            CoreConst.REFRESH_TOKEN,
+            CoreConst2.REFRESH_TOKEN,
             res.data.refresh_token,
             cacheDay,
             true
           );
         }
-        clearCookie(CoreConst.IS_ANONYMOUS);
+        clearCookie(CoreConst2.IS_ANONYMOUS);
       }
     }
   }
@@ -12165,8 +12216,8 @@ var V7AuthService = class {
    * @return {*}  {(IAuthInfo | undefined)}
    */
   getAuthInfo() {
-    const token = getCookie(CoreConst.TOKEN);
-    const isAnonymous = !!getCookie(CoreConst.IS_ANONYMOUS);
+    const token = getCookie2(CoreConst2.TOKEN);
+    const isAnonymous = !!getCookie2(CoreConst2.IS_ANONYMOUS);
     return token ? {
       token,
       isAnonymous
@@ -12193,11 +12244,11 @@ var V7AuthService = class {
    * @protected
    */
   clearAuthData() {
-    clearCookie(CoreConst.TOKEN);
-    clearCookie(CoreConst.TOKEN_EXPIRES);
-    clearCookie(CoreConst.TOKEN_REMEMBER);
-    clearCookie(CoreConst.REFRESH_TOKEN);
-    clearCookie(CoreConst.IS_ANONYMOUS);
+    clearCookie(CoreConst2.TOKEN);
+    clearCookie(CoreConst2.TOKEN_EXPIRES);
+    clearCookie(CoreConst2.TOKEN_REMEMBER);
+    clearCookie(CoreConst2.REFRESH_TOKEN);
+    clearCookie(CoreConst2.IS_ANONYMOUS);
     ibiz.appData = void 0;
     ibiz.orgData = void 0;
   }
@@ -19867,9 +19918,11 @@ var BaseSeriesGenerator = class {
   prepareChartData(groupData, deData, catalog, group) {
     var _a;
     if (this.groupField) {
+      deData["".concat(this.groupField, "_value")] = deData[this.groupField];
       Object.assign(deData, { [this.groupField]: group });
     }
     if (this.catalogField) {
+      deData["".concat(this.catalogField, "_value")] = deData[this.catalogField];
       Object.assign(deData, { [this.catalogField]: catalog });
     }
     const tempChartData = new ChartData(deData, this.model, catalog, group);
@@ -35349,10 +35402,11 @@ var TreeController = class extends MDControlController {
     var _a, _b;
     const draggingNodeModel = this.getNodeModel(draggingNode._nodeId);
     if (type === "inner") {
+      const nodeModel = this.getNodeModel(dropNode._nodeId);
       return !!this.findDropNodeRS(
         dropNode._nodeId,
         draggingNodeModel.appDataEntityId
-      );
+      ) && !!(nodeModel == null ? void 0 : nodeModel.allowDrop);
     }
     if (((_a = draggingNode._parent) == null ? void 0 : _a._id) === ((_b = dropNode._parent) == null ? void 0 : _b._id)) {
       const currentNodeModel = this.getNodeModel(dropNode._nodeId);
@@ -39176,9 +39230,6 @@ var GanttService = class extends TreeService {
 
 // src/controller/control/gantt/gantt.controller.ts
 var GanttController = class extends TreeGridExController {
-  get _evt() {
-    return this.evt;
-  }
   /**
    * 初始化状态
    *
@@ -39255,7 +39306,7 @@ var GanttController = class extends TreeGridExController {
     if (item._nodeType === "DE") {
       await this.onNodeDataActive(nodeParams);
     }
-    return this._evt.emit("onActive", { ...nodeParams, nodeData: item });
+    return this.evt.emit("onActive", { ...nodeParams, nodeData: item });
   }
   /**
    * 节点数据激活
@@ -39285,12 +39336,7 @@ var GanttController = class extends TreeGridExController {
         });
         const children = this.model.rootVisible ? nodes : nodes[0]._children;
         if (children) {
-          const state = await this.handleDefaultExpandNodes(children);
-          if (state) {
-            this._evt.emit("onDefaultExpand", {
-              nodes: children
-            });
-          }
+          await this.handleDefaultExpandNodes(children);
         }
       },
       {
@@ -39326,34 +39372,30 @@ var GanttController = class extends TreeGridExController {
     }
     const targetNode = refreshParent ? currentNode._parent : currentNode;
     const nodes = await this.loadNodes(targetNode);
-    const state = await this.handleDefaultExpandNodes(nodes);
-    if (state) {
-      this._evt.emit("onDefaultExpand", {
-        nodes
-      });
-    }
-    this._evt.emit("onAfterRefreshParent", {
+    await this.handleDefaultExpandNodes(nodes);
+    this.evt.emit("onAfterRefreshParent", {
       parentNode: targetNode,
       children: nodes
     });
   }
   /**
-   * 处理已展开节点子节点数据
+   * 处理默认展开
    *
    * @param {ITreeNodeData[]} data 子节点数据
    * @return {*}  {Promise<void>}
    */
   async handleDefaultExpandNodes(data) {
-    let state = false;
     for (let i = 0; i < data.length; i++) {
       const nodeData = data[i];
       if (this.state.expandedKeys.includes(nodeData._id)) {
-        state = true;
-        const nodes = await this.loadNodes(nodeData);
+        const key = nodeData.srfkey ? "srfkey" : "_id";
+        const currentNode = this.state.items.find(
+          (item) => item[key] === nodeData[key]
+        );
+        const nodes = await this.loadNodes(currentNode);
         await this.handleDefaultExpandNodes(nodes);
       }
     }
-    return state;
   }
   /**
    * 打开编辑数据视图
@@ -39496,7 +39538,7 @@ var GanttController = class extends TreeGridExController {
         nodeData._deData
       );
     } catch (error) {
-      await this._evt.emit("onSaveError", void 0);
+      await this.evt.emit("onSaveError", void 0);
       this.actionNotification("".concat(isCreate ? "CREATE" : "UPDATE", "ERROR"), {
         error,
         data: rowState.data
@@ -39506,7 +39548,7 @@ var GanttController = class extends TreeGridExController {
     rowState.data._deData = res.data;
     rowState.modified = false;
     this.gridStateNotify(rowState, "SAVE" /* SAVE */);
-    await this._evt.emit("onSaveSuccess", void 0);
+    await this.evt.emit("onSaveSuccess", void 0);
   }
   /**
    * 删除
@@ -39533,7 +39575,7 @@ var GanttController = class extends TreeGridExController {
         return;
       }
     }
-    await this._evt.emit("onBeforeRemove", void 0);
+    await this.evt.emit("onBeforeRemove", void 0);
     await this.startLoading();
     let needRefresh = false;
     let refreshNode;
@@ -39578,7 +39620,7 @@ var GanttController = class extends TreeGridExController {
         await this.refreshNodeChildren(refreshNode);
       }
     } catch (error) {
-      await this._evt.emit("onRemoveError", void 0);
+      await this.evt.emit("onRemoveError", void 0);
       this.actionNotification("REMOVEERROR", {
         error,
         data
@@ -39588,7 +39630,7 @@ var GanttController = class extends TreeGridExController {
       await this.endLoading();
     }
     this.state.selectedData = [];
-    await this._evt.emit("onRemoveSuccess", void 0);
+    await this.evt.emit("onRemoveSuccess", void 0);
   }
   /**
    * 后台删除结束后界面删除逻辑
@@ -39696,11 +39738,88 @@ var GanttController = class extends TreeGridExController {
         if (editShowMode === "row") {
           this.switchRowEdit(rowState, true);
         }
-        this._evt.emit("onNewRow", { row: parentRow });
+        this.evt.emit("onNewRow", { row: parentRow });
         this.actionNotification("GETDRAFTSUCCESS", { data: draftData });
       }
     }
   }
+  /**
+   * 处理节点拖入事件
+   *
+   * @param {IGanttNodeData} draggingNode 拖动节点
+   * @param {IGanttNodeData} dropNode 目标节点
+   * @param {('inner' | 'prev' | 'next')} dropType 拖放类型
+   * @return {*}  {Promise<void>}
+   * @memberof GanttController
+   */
+  async onNodeDrop(draggingNode, dropNode, dropType) {
+    var _a, _b;
+    if (dropType === "inner" && !dropNode._leaf && dropNode._children === void 0) {
+      await this.expandNodeByKey([dropNode._id]);
+    }
+    const modifiedNodeDatas = [];
+    const draggingNodeModel = this.getNodeModel(draggingNode._nodeId);
+    const dropInNode = dropType === "inner" ? dropNode : dropNode._parent;
+    let orderNodeModel = this.getNodeModel(dropNode._nodeId);
+    if (dropType === "inner" || ((_a = dropNode._parent) == null ? void 0 : _a._id) !== ((_b = draggingNode._parent) == null ? void 0 : _b._id)) {
+      const dropNodeRs = this.findDropNodeRS(
+        dropInNode._nodeId,
+        draggingNodeModel.appDataEntityId
+      );
+      if (dropNodeRs) {
+        draggingNode._deData[dropNodeRs.pickupDEFName] = dropInNode._value;
+        modifiedNodeDatas.push(draggingNode);
+        orderNodeModel = this.getNodeModel(dropNodeRs.childDETreeNodeId);
+      }
+      draggingNode._parent = dropInNode;
+      draggingNode._nodeId = orderNodeModel.id;
+    }
+    const { sortAppDEFieldId, sortDir, allowOrder } = orderNodeModel;
+    if (allowOrder === true) {
+      if (!sortAppDEFieldId) {
+        throw new RuntimeModelError72(
+          orderNodeModel,
+          ibiz.i18n.t("runtime.controller.control.tree.sortAttribute")
+        );
+      }
+      const sortField = sortAppDEFieldId.toLowerCase();
+      const isAsc = sortDir === "ASC";
+      const changedArr = dropInNode._children;
+      if (!isAsc) {
+        changedArr.reverse();
+      }
+      const getNextSort = (num) => {
+        return num + (100 - num % 100);
+      };
+      const getSort = (deData) => {
+        return deData[sortField] || 0;
+      };
+      let lastSort;
+      changedArr.forEach((item, index) => {
+        const deData = item._deData;
+        if (lastSort === void 0) {
+          if (item === draggingNode) {
+            if (index === 0) {
+              lastSort = 100;
+            } else {
+              lastSort = getNextSort(getSort(changedArr[index - 1]._deData));
+            }
+            deData[sortField] = lastSort;
+            if (modifiedNodeDatas.indexOf(item) === -1) {
+              modifiedNodeDatas.push(item);
+            }
+          }
+        } else {
+          if (lastSort >= getSort(deData)) {
+            deData[sortField] = getNextSort(lastSort);
+            modifiedNodeDatas.push(item);
+          }
+          lastSort = getSort(deData);
+        }
+      });
+    }
+    await this.updateDeNodeData(modifiedNodeDatas);
+  }
   onDEDataChange(msg) {
   }
 };