@ibiz-template/runtime 0.7.17-alpha.0 → 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
@@ -10620,6 +10671,7 @@ var MethodDto = class {
    */
   async get(context, data, ignore = false) {
     if (context.srfsimple === true && this.isLocalMode === false) {
+      data = this.format(context, data);
       return data;
     }
     const params = {};
@@ -10710,6 +10762,9 @@ var MethodDto = class {
   async sets(context, data) {
     if (context.srfsimple === true && this.isLocalMode === false) {
       if (data && data.length > 0) {
+        for (let i = 0; i < data.length; i++) {
+          data[i] = this.format(context, data[i]);
+        }
         return data.map((item) => {
           return this.service.createEntity(item);
         });
@@ -10808,8 +10863,13 @@ var MethodDto = class {
     for (let i = 0; i < this.fields.length; i++) {
       const field = this.fields[i];
       const key = field.codeName.toLowerCase();
-      if (field.type === "DTOS" && field.listMap && typeof data[key] === "object") {
-        params[key] = convertListMapToArray(data[key]);
+      if (field.type === "DTOS" && field.listMap) {
+        if (Object.prototype.toString.call(data[key]) === "[object Object]") {
+          params[key] = convertListMapToArray(data[key]);
+        }
+        if (Object.prototype.toString.call(data[key]) === "[object Array]") {
+          params[key] = convertArrayToListMap(data[key]);
+        }
       }
     }
     return { ...data, ...params };
@@ -11938,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";
   }
   /**
    * 使用匿名账号登录
@@ -11959,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;
@@ -12001,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) {
@@ -12076,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 !== "") {
@@ -12094,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
@@ -12124,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);
       }
     }
   }
@@ -12156,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
@@ -12184,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;
   }
@@ -12284,7 +12344,7 @@ var MethodInput = class {
     return data;
   }
   /**
-   * 格式化本地模式入参
+   * 格式化
    *
    * @author tony001
    * @date 2024-05-21 23:05:38
@@ -12365,6 +12425,21 @@ var MethodReturn = class {
     }
     return new AppDataEntity(this.entity, data);
   }
+  /**
+   * 格式化
+   *
+   * @author tony001
+   * @date 2024-05-23 18:05:35
+   * @param {IContext} context
+   * @param {IData} data
+   * @return {*}  {Promise<IData>}
+   */
+  async format(context, data) {
+    if (this.dto) {
+      return this.dto.format(context, data);
+    }
+    return data;
+  }
 };
 
 // src/service/service/entity/method/method.ts
@@ -13068,6 +13143,9 @@ var FetchMethod = class extends Method {
           );
       }
       const items = res.data || [];
+      for (let i = 0; i < items.length; i++) {
+        items[i] = await this.result.format(context, items[i]);
+      }
       res.data = items.map((item) => this.createEntity(item));
     }
     if (res.data) {
@@ -18916,6 +18994,158 @@ import {
   RuntimeError as RuntimeError37,
   RuntimeModelError as RuntimeModelError27
 } from "@ibiz-template/core";
+
+// src/controller/control/app-menu/custom-app-menu.controller.ts
+var CustomAppMenuController = class {
+  /**
+   * Creates an instance of CustomAppMenuController.
+   * @author tony001
+   * @date 2024-05-09 15:05:33
+   * @param {IAppMenu} model
+   * @param {AppMenuController} menu
+   */
+  constructor(model, menu) {
+    this.model = model;
+    this.menu = menu;
+    /**
+     *自定义定制范围类型（public：公开，personal：个人，data：数据，默认是按照个人区分，配置了应用功能组件才生效）
+     *
+     * @author tony001
+     * @date 2024-05-09 17:05:43
+     * @type {('public' | 'personal' | 'data')}
+     */
+    this.type = "personal";
+    /**
+     *所属数据类型（仅限自定义定制为data类型时生效，配置了应用功能组件才生效）
+     *
+     * @author tony001
+     * @date 2024-05-09 17:05:55
+     * @type {string}
+     */
+    this.ownerType = "";
+    /**
+     *所属数据标识（仅限自定义定制为data类型时生效，配置了应用功能组件才生效）
+     *
+     * @author tony001
+     * @date 2024-05-09 17:05:10
+     * @type {string}
+     */
+    this.ownerId = "";
+    this.context = menu.context;
+    this.params = menu.params;
+    this.init();
+  }
+  /**
+   * 初始化
+   *
+   * @author tony001
+   * @date 2024-05-09 15:05:40
+   * @private
+   */
+  init() {
+    var _a;
+    this.type = "personal";
+    this.ownerId = this.context.srfpersonid;
+    const app = ibiz.hub.getApp(this.context.srfappid);
+    const menuUtil = app.getAppUtil("DYNAMENU", "CUSTOM");
+    if (menuUtil) {
+      this.util = new UtilService(menuUtil);
+    } else {
+      this.config = new ConfigService(
+        this.model.appId,
+        "menu",
+        "menu_".concat(this.menu.view.name.toLowerCase(), "_").concat((_a = this.model.codeName) == null ? void 0 : _a.toLowerCase())
+      );
+    }
+  }
+  /**
+   * 获取资源标识（仅用于功能组件服务）
+   *
+   * @author tony001
+   * @date 2024-05-09 16:05:48
+   * @private
+   * @return {*}  {string}
+   */
+  getResourceTag() {
+    var _a;
+    const base = "".concat(this.context.srfappid, "_menu_").concat(this.menu.view.name.toLowerCase(), "_").concat((_a = this.model.codeName) == null ? void 0 : _a.toLowerCase());
+    switch (this.type) {
+      case "personal":
+        return "".concat(base, "_").concat(this.context.srfpersonid);
+      case "data":
+        return "".concat(base, "_").concat(this.ownerType, "_").concat(this.ownerId);
+      default:
+        return base;
+    }
+  }
+  /**
+   * 加载自定义模型
+   *
+   * @author tony001
+   * @date 2024-05-09 17:05:57
+   * @return {*}  {Promise<IData>}
+   */
+  async loadCustomModelData() {
+    let res;
+    if (this.util) {
+      res = await this.util.load(
+        this.getResourceTag(),
+        this.context,
+        this.params
+      );
+    } else {
+      res = await this.config.load();
+    }
+    if (res && res.model) {
+      const result = JSON.parse(res.model);
+      return result;
+    }
+    return [];
+  }
+  /**
+   * 重置自定义模型
+   *
+   * @author tony001
+   * @date 2024-05-09 17:05:14
+   * @return {*}  {Promise<IData>}
+   */
+  async resetCustomModelData() {
+    return this.saveCustomModelData([]);
+  }
+  /**
+   * 保存自定义模型
+   *
+   * @author tony001
+   * @date 2024-05-09 17:05:51
+   * @param {IData[]} model
+   * @param {IData} [opts={}]
+   * @return {*}  {Promise<IData>}
+   */
+  async saveCustomModelData(model, opts = {}) {
+    const data = {
+      model: JSON.stringify(model)
+    };
+    if (this.util) {
+      await this.util.save(
+        this.getResourceTag(),
+        this.context,
+        {
+          ...this.params,
+          type: this.type,
+          ownerType: this.ownerType,
+          ownerId: this.ownerId,
+          modelId: this.model.id
+        },
+        data
+      );
+    } else {
+      await this.config.save(data);
+    }
+    return model;
+  }
+};
+
+// src/controller/control/app-menu/app-menu.controller.ts
 var AppMenuController = class extends ControlController {
   constructor(model, context, params, ctx) {
     super(model, context, params, ctx);
@@ -18926,7 +19156,24 @@ var AppMenuController = class extends ControlController {
      * @type {{ [key: string]: IProvider }}
      */
     this.itemProviders = {};
+    /**
+     * 自定义菜单控制器
+     *
+     * @type {(CustomAppMenuController | null)}
+     * @memberof AppMenuController
+     */
+    this.customController = null;
+    /**
+     * 自定义配置
+     *
+     * @type {IData[]}
+     * @memberof AppMenuController
+     */
+    this.saveConfigs = [];
     this.flattenAllItems();
+    if (model.enableCustomized) {
+      this.customController = new CustomAppMenuController(model, this);
+    }
   }
   initState() {
     super.initState();
@@ -18950,6 +19197,24 @@ var AppMenuController = class extends ControlController {
     (_a = this.model.appMenuItems) == null ? void 0 : _a.forEach((item) => {
       this.initMenuItemState(item);
     });
+    if (this.customController) {
+      await this.loadCustomMenusModel();
+    }
+  }
+  /**
+   * 加载自定义菜单模型
+   *
+   * @private
+   * @return {*}  {Promise<void>}
+   * @memberof AppMenuController
+   */
+  async loadCustomMenusModel() {
+    const customConfigs = await this.customController.loadCustomModelData();
+    if (!customConfigs || customConfigs.length === 0) {
+      this.saveConfigs = [];
+    } else {
+      this.saveConfigs = customConfigs;
+    }
   }
   /**
    * 初始化菜单项的适配器
@@ -19114,149 +19379,6 @@ var AppMenuController = class extends ControlController {
   }
 };
 
-// src/controller/control/app-menu/custom-app-menu.controller.ts
-var CustomAppMenuController = class {
-  /**
-   * Creates an instance of CustomAppMenuController.
-   * @author tony001
-   * @date 2024-05-09 15:05:33
-   * @param {IAppMenu} model
-   * @param {AppMenuController} menu
-   */
-  constructor(model, menu) {
-    this.model = model;
-    this.menu = menu;
-    /**
-     *自定义定制范围类型（public：公开，personal：个人，data：数据，默认是按照个人区分，配置了应用功能组件才生效）
-     *
-     * @author tony001
-     * @date 2024-05-09 17:05:43
-     * @type {('public' | 'personal' | 'data')}
-     */
-    this.type = "personal";
-    /**
-     *所属数据类型（仅限自定义定制为data类型时生效，配置了应用功能组件才生效）
-     *
-     * @author tony001
-     * @date 2024-05-09 17:05:55
-     * @type {string}
-     */
-    this.ownerType = "";
-    /**
-     *所属数据标识（仅限自定义定制为data类型时生效，配置了应用功能组件才生效）
-     *
-     * @author tony001
-     * @date 2024-05-09 17:05:10
-     * @type {string}
-     */
-    this.ownerId = "";
-    this.context = menu.context;
-    this.params = menu.params;
-    this.init();
-  }
-  /**
-   * 初始化
-   *
-   * @author tony001
-   * @date 2024-05-09 15:05:40
-   * @private
-   */
-  init() {
-    var _a;
-    this.type = "personal";
-    this.ownerId = this.context.srfpersonid;
-    const app = ibiz.hub.getApp(this.context.srfappid);
-    const menuUtil = app.getAppUtil("DYNAMENU", "CUSTOM");
-    if (menuUtil) {
-      this.util = new UtilService(menuUtil);
-    } else {
-      this.config = new ConfigService(
-        this.model.appId,
-        "menu",
-        "menu_".concat(this.menu.view.name.toLowerCase(), "_").concat((_a = this.model.codeName) == null ? void 0 : _a.toLowerCase())
-      );
-    }
-  }
-  /**
-   * 获取资源标识（仅用于功能组件服务）
-   *
-   * @author tony001
-   * @date 2024-05-09 16:05:48
-   * @private
-   * @return {*}  {string}
-   */
-  getResourceTag() {
-    var _a;
-    const base = "".concat(this.context.srfappid, "_menu_").concat(this.menu.view.name.toLowerCase(), "_").concat((_a = this.model.codeName) == null ? void 0 : _a.toLowerCase());
-    switch (this.type) {
-      case "personal":
-        return "".concat(base, "_").concat(this.context.srfpersonid);
-      case "data":
-        return "".concat(base, "_").concat(this.ownerType, "_").concat(this.ownerId);
-      default:
-        return base;
-    }
-  }
-  /**
-   * 加载自定义模型
-   *
-   * @author tony001
-   * @date 2024-05-09 17:05:57
-   * @return {*}  {Promise<IData>}
-   */
-  async loadCustomModelData() {
-    let res;
-    if (this.util) {
-      res = await this.util.load(
-        this.getResourceTag(),
-        this.context,
-        this.params
-      );
-    } else {
-      res = await this.config.load();
-    }
-    return res;
-  }
-  /**
-   * 重置自定义模型
-   *
-   * @author tony001
-   * @date 2024-05-09 17:05:14
-   * @return {*}  {Promise<IData>}
-   */
-  async resetCustomModelData() {
-    return {};
-  }
-  /**
-   * 保存自定义模型
-   *
-   * @author tony001
-   * @date 2024-05-09 17:05:51
-   * @param {IData[]} model
-   * @param {IData} [opts={}]
-   * @return {*}  {Promise<IData>}
-   */
-  async saveCustomModelData(model, opts = {}) {
-    if (this.util) {
-      await this.util.save(
-        this.getResourceTag(),
-        this.context,
-        {
-          ...this.params,
-          type: this.type,
-          ownerType: this.ownerType,
-          ownerId: this.ownerId,
-          modelId: this.model.id
-        },
-        model
-      );
-    } else {
-      await this.config.save(model);
-    }
-    return model;
-  }
-};
-
 // src/controller/control/app-menu-icon-view/app-menu-icon-view.controller.ts
 import {
   findRecursiveChild as findRecursiveChild2,
@@ -19796,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);
@@ -24743,7 +24867,11 @@ var DataViewControlController = class extends MDControlController {
           containerState.addState(detail.id, buttonState);
         }
       });
-      await containerState.update(this.context);
+      await containerState.update(
+        this.context,
+        void 0,
+        this.model.appDataEntityId
+      );
       group.groupActionGroupState = containerState;
     });
   }
@@ -35274,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);
@@ -36348,6 +36477,7 @@ var KanbanController = class extends DataViewControlController {
     this.state.updating = false;
     this.state.batching = false;
     this.state.selectGroupKey = "";
+    this.state.readonly = !!(this.context.srfreadonly === true || this.context.srfreadonly === "true");
     this.state.draggable = this.enableEditOrder || this.enableEditGroup;
     this.state.uaState = {};
   }
@@ -36902,6 +37032,28 @@ var TreeGridExRowState = class {
           editable: ibiz.config.grid.editShowMode === "all",
           required: false
         };
+        let $readonly;
+        Object.defineProperty(
+          this.editColStates[fieldColumn.name],
+          "readonly",
+          {
+            enumerable: true,
+            configurable: true,
+            get() {
+              if ($readonly !== void 0) {
+                return $readonly;
+              }
+              if (treeGrid.context) {
+                return !!(treeGrid.context.srfreadonly === true || treeGrid.context.srfreadonly === "true");
+              }
+              return false;
+            },
+            set(val) {
+              $readonly = val;
+              return true;
+            }
+          }
+        );
       });
     }
   }
@@ -39078,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;
-  }
   /**
    * 初始化状态
    *
@@ -39157,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 });
   }
   /**
    * 节点数据激活
@@ -39187,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);
         }
       },
       {
@@ -39228,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;
   }
   /**
    * 打开编辑数据视图
@@ -39398,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
@@ -39408,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);
   }
   /**
    * 删除
@@ -39435,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;
@@ -39480,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
@@ -39490,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);
   }
   /**
    * 后台删除结束后界面删除逻辑
@@ -39598,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) {
   }
 };