@ibiz-template/runtime 0.5.1-next.0 → 0.5.2

package/dist/index.esm.js

@@ -9710,7 +9710,7 @@ var calcDataItemValue = (fieldCodeName, nodeModel, data = {}) => {
     return result;
   }
   const targetTreeNodeDataItem = nodeModel.detreeNodeDataItems.find((nodeDataItem) => {
-    return nodeDataItem.id === fieldCodeName;
+    return nodeDataItem.detreeColumnId === fieldCodeName;
   });
   if (targetTreeNodeDataItem && targetTreeNodeDataItem.appDEFieldId) {
     result = data[targetTreeNodeDataItem.appDEFieldId];
@@ -9722,7 +9722,7 @@ var calcDataItemValue = (fieldCodeName, nodeModel, data = {}) => {
 var GanttStaticNodeData = class extends TreeStaticNodeData {
   constructor(model, nodeModel, parentNodeData, opts) {
     super(nodeModel, parentNodeData, opts);
-    this._sndataIteValue = calcDataItemValue(model.sndataItemName, nodeModel);
+    this._snDataItemValue = calcDataItemValue(model.sndataItemName, nodeModel);
     this._beginDataItemValue = calcDataItemValue(
       model.beginDataItemName,
       nodeModel
@@ -9751,7 +9751,7 @@ var GanttDataSetNodeData = class extends TreeDataSetNodeData {
   constructor(model, nodeModel, parentNodeData, opts) {
     super(nodeModel, parentNodeData, opts);
     const { data } = opts;
-    this._sndataIteValue = calcDataItemValue(
+    this._snDataItemValue = calcDataItemValue(
       model.sndataItemName,
       nodeModel,
       data
@@ -9789,7 +9789,7 @@ var GanttCodeListNodeData = class extends TreeCodeListNodeData {
   constructor(model, nodeModel, parentNodeData, opts) {
     super(nodeModel, parentNodeData, opts);
     const { data } = opts;
-    this._sndataIteValue = calcDataItemValue(
+    this._snDataItemValue = calcDataItemValue(
       model.sndataItemName,
       nodeModel,
       data
@@ -21863,7 +21863,6 @@ var EditFormController = class extends FormController {
           )
         );
       }
-      await awaitTimeout(2e3);
     } finally {
       if (showBusyIndicator) {
         this.endLoading();
@@ -22879,20 +22878,36 @@ var GridController = class extends MDControlController {
    * @return {*}  {Promise<void>}
    */
   initColumnStates() {
-    recursiveIterate7(
-      this.model,
-      (column) => {
-        if (column.columnType !== "GROUPGRIDCOLUMN") {
-          this.state.columnStates.push({
-            key: column.codeName,
-            caption: column.caption,
-            hidden: !!column.hideDefault,
-            uaColumn: column.columnType === "UAGRIDCOLUMN"
-          });
-        }
-      },
-      { childrenFields: ["degridColumns"] }
+    this.state.columnStates = [];
+    const storageColumnStatesStr = localStorage.getItem(
+      "".concat(this.view.model.id, ".").concat(this.model.name, ".columnStates")
     );
+    if (storageColumnStatesStr) {
+      const storageColumnStates = JSON.parse(
+        storageColumnStatesStr
+      );
+      if (this.addSchemaColumn && storageColumnStates.schemaColumnStates) {
+        this.state.columnStates = storageColumnStates.schemaColumnStates;
+      } else if (!this.addSchemaColumn && storageColumnStates.defaultColumnStates) {
+        this.state.columnStates = storageColumnStates.defaultColumnStates;
+      }
+    }
+    if (this.state.columnStates.length === 0) {
+      recursiveIterate7(
+        this.model,
+        (column) => {
+          if (column.columnType !== "GROUPGRIDCOLUMN") {
+            this.state.columnStates.push({
+              key: column.codeName,
+              caption: column.caption,
+              hidden: !!column.hideDefault,
+              uaColumn: column.columnType === "UAGRIDCOLUMN"
+            });
+          }
+        },
+        { childrenFields: ["degridColumns"] }
+      );
+    }
     this.calcColumnFixed();
   }
   /**
@@ -23378,6 +23393,7 @@ var GridController = class extends MDControlController {
    */
   setColumnVisible(columnState) {
     columnState.hidden = !columnState.hidden;
+    this.saveColumnStates();
   }
   /**
    * 设置点击分组后回显相关参数
@@ -23395,10 +23411,49 @@ var GridController = class extends MDControlController {
     if (data.columnstates) {
       this.state.columnStates = data.columnstates;
     } else {
-      this.state.columnStates = [];
       this.initColumnStates();
     }
   }
+  /**
+   * 改变列排序
+   * @return {*}
+   * @author: zhujiamin
+   * @Date: 2024-01-05 11:21:07
+   */
+  changeColumnStateSort(columnKey, newIndex, oldIndex) {
+    const columnState = this.state.columnStates.find(
+      (item) => item.key === columnKey
+    );
+    if (columnState) {
+      this.state.columnStates.splice(oldIndex, 1);
+      this.state.columnStates.splice(newIndex, 0, columnState);
+      this.saveColumnStates();
+    }
+  }
+  /**
+   * 存储列状态到本地
+   * @return {*}
+   * @author: zhujiamin
+   * @Date: 2024-01-05 13:45:36
+   */
+  saveColumnStates() {
+    let storageColumnStates = {};
+    const storageColumnStatesStr = localStorage.getItem(
+      "".concat(this.view.model.id, ".").concat(this.model.name, ".columnStates")
+    );
+    if (storageColumnStatesStr) {
+      storageColumnStates = JSON.parse(storageColumnStatesStr);
+    }
+    if (this.addSchemaColumn) {
+      storageColumnStates.schemaColumnStates = this.state.columnStates;
+    } else {
+      storageColumnStates.defaultColumnStates = this.state.columnStates;
+    }
+    localStorage.setItem(
+      "".concat(this.view.model.id, ".").concat(this.model.name, ".columnStates"),
+      JSON.stringify(storageColumnStates)
+    );
+  }
 };
 
 // src/controller/control/grid/grid-column/grid-field-column/grid-field-column.controller.ts
@@ -28179,6 +28234,9 @@ var TreeGridExRowState = class {
      */
     this.uaColStates = {};
     this.data = data;
+    Object.values(treeGrid.fieldColumns).forEach((column) => {
+      column.initColumnStates(this);
+    });
     Object.values(treeGrid.uaColumns).forEach((column) => {
       column.initActionStates(this);
     });
@@ -28473,6 +28531,30 @@ var TreeGridExColumnController = class {
 
 // src/controller/control/tree-grid-ex/tree-grid-ex-column/tree-grid-ex-field-column/tree-grid-ex-field-column.controller.ts
 var TreeGridExFieldColumnController = class extends TreeGridExColumnController {
+  /**
+   * 给rowController初始化属性列的状态
+   *
+   * @author zpc
+   * @date 2024-01-07 21:09:43
+   * @param {ITreeGridExRowState} row
+   */
+  initColumnStates(row) {
+    const { data } = row;
+    if (!this.model.id || !data._deData) {
+      return;
+    }
+    const { detreeNodeDataItems } = this.treeGrid.getNodeModel(
+      data._nodeId
+    );
+    const targetTreeNodeDataItem = detreeNodeDataItems == null ? void 0 : detreeNodeDataItems.find(
+      (treeNodeDataItem) => {
+        return treeNodeDataItem.detreeColumnId === this.model.id;
+      }
+    );
+    if (targetTreeNodeDataItem && targetTreeNodeDataItem.appDEFieldId) {
+      data[this.model.id.toLowerCase()] = data._deData[targetTreeNodeDataItem.appDEFieldId.toLowerCase()];
+    }
+  }
 };
 
 // src/controller/control/tree-grid-ex/tree-grid-ex-column/tree-grid-ex-ua-column/tree-grid-ex-ua-column.controller.ts
@@ -29883,6 +29965,27 @@ var AppHub = class {
     }
     throw new RuntimeError61("\u89C6\u56FE[".concat(id, "]\u4E0D\u5B58\u5728"));
   }
+  /**
+   * 根据视图模型路径，加参数重新计算视图模型
+   *
+   * @author chitanda
+   * @date 2024-01-08 11:01:54
+   * @param {string} appId
+   * @param {string} modelPath
+   * @param {IParams} params
+   * @return {*}  {Promise<IAppView>}
+   */
+  async loadAppView(appId2, modelPath, params) {
+    if (this.modelLoaderProvider) {
+      const model = await this.modelLoaderProvider.loadAppView(
+        appId2,
+        modelPath,
+        params
+      );
+      return model;
+    }
+    throw new RuntimeError61("\u89C6\u56FE[".concat(modelPath, "]\u4E0D\u5B58\u5728"));
+  }
   /**
    * 根据应用实体代码名称查找应用视图
    *
@@ -31461,7 +31564,13 @@ var AppUILogicExecutor = class extends LogicExecutor {
       rest
     );
     if (enableBatchAdd && result.data) {
-      await this.doBatchAdd(appUILogic, result.data, context, newViewRef);
+      await this.doBatchAdd(
+        appUILogic,
+        result.data,
+        context,
+        newViewRef,
+        parameters.view
+      );
     }
     return result;
   }
@@ -31522,7 +31631,7 @@ var AppUILogicExecutor = class extends LogicExecutor {
    * @param {IAppUILogicRefViewBase} newViewRef
    * @return {*}  {Promise<void>}
    */
-  async doBatchAdd(appUILogic, selections, context, newViewRef) {
+  async doBatchAdd(appUILogic, selections, context, newViewRef, view) {
     var _a;
     if (selections == null ? void 0 : selections.length) {
       const selfDe = await ibiz.hub.getAppDataEntity(
@@ -31534,45 +31643,43 @@ var AppUILogicExecutor = class extends LogicExecutor {
       if (!minorDERs) {
         throw new RuntimeModelError69(selfDe, "\u5B9E\u4F53\u6CA1\u6709\u4ECE\u5173\u7CFB\u96C6\u5408\uFF01");
       }
-      let pickParentFieldName;
+      let pickParentFieldName = "";
       minorDERs == null ? void 0 : minorDERs.forEach((item) => {
         const majorDeName = calcDeCodeNameById(item.majorAppDataEntityId);
         if (pickParentDeName === majorDeName) {
           pickParentFieldName = item.parentAppDEFieldId;
         }
       });
-      const openViewKeyParam = (_a = newViewRef.navigateParams) == null ? void 0 : _a.find((navParam) => {
-        return navParam.key === "keymapping";
-      });
-      let addData = [];
-      if (openViewKeyParam) {
-        const keyValuePairs = openViewKeyParam.value.split(";");
-        const keyMapping = {};
+      if (pickParentFieldName === void 0) {
+        throw new RuntimeError67(
+          "\u6CA1\u6709\u627E\u5230".concat(pickParentDeName, "\u5728\u5F53\u524D\u5B9E\u4F53\u7684\u5916\u952E\u5C5E\u6027")
+        );
+      }
+      const keyMapping = {
+        srfkey: pickParentFieldName
+      };
+      const propertyMap = (_a = view.model.appViewParams) == null ? void 0 : _a.find(
+        (item) => item.key.toLowerCase() === "PROPERTYMAP".toLowerCase()
+      );
+      if (propertyMap) {
+        const keyValuePairs = propertyMap.value.split(",");
         for (const pair of keyValuePairs) {
           const [sourceKey, targetKey] = pair.split(":");
           if (sourceKey && targetKey) {
             keyMapping[sourceKey] = targetKey;
           }
         }
-        addData = selections.map((item) => {
-          const tempData = {
-            [pickParentFieldName]: item.srfkey
-          };
-          for (const key in keyMapping) {
-            if (Object.prototype.hasOwnProperty.call(keyMapping, key)) {
-              const targetKey = keyMapping[key];
-              if (Object.prototype.hasOwnProperty.call(item, key)) {
-                tempData[targetKey] = item[key];
-              }
-            }
-          }
-          return tempData;
-        });
-      } else {
-        addData = selections.map((item) => ({
-          [pickParentFieldName]: item.srfkey
-        }));
       }
+      ibiz.log.debug("\u6279\u91CF\u65B0\u5EFA\u8F6C\u6362\u6620\u5C04\u5C5E\u6027", keyMapping);
+      const addData = selections.map((item) => {
+        const tempData = {};
+        Object.keys(keyMapping).forEach((key) => {
+          const targetKey = keyMapping[key];
+          tempData[targetKey] = item[key];
+        });
+        return tempData;
+      });
+      ibiz.log.debug("\u6279\u91CF\u65B0\u5EFA\u521B\u5EFA\u6570\u636E", addData);
       const service = ibiz.hub.getApp(context.srfappid).deService;
       await service.exec(selfDe.id, "Create", context, addData);
     }