@ibiz-template/runtime 0.7.24-alpha.1 → 0.7.24

package/dist/index.esm.js

@@ -4826,7 +4826,7 @@ var DynamicCodeListCache = class {
    * @param {IData} data
    * @returns {*}
    */
-  convertData(data) {
+  convertData(data, index, items) {
     const result = {};
     const {
       valueAppDEFieldId,
@@ -4838,7 +4838,12 @@ var DynamicCodeListCache = class {
       disableAppDEFieldId,
       dataAppDEFieldId,
       clsAppDEFieldId,
-      colorAppDEFieldId
+      colorAppDEFieldId,
+      thresholdGroup,
+      beginValueAppDEFieldId,
+      endValueAppDEFieldId,
+      incBeginValueMode,
+      incEndValueMode
     } = this.codeList;
     const value = valueAppDEFieldId ? data[valueAppDEFieldId] : data.srfkey;
     result.id = value;
@@ -4878,6 +4883,42 @@ var DynamicCodeListCache = class {
         ibiz.log.error(ibiz.i18n.t("runtime.service.dynamicCodeTable"));
       }
     }
+    if (thresholdGroup) {
+      if (beginValueAppDEFieldId) {
+        result.beginValue = data[beginValueAppDEFieldId];
+      }
+      if (endValueAppDEFieldId) {
+        result.endValue = data[endValueAppDEFieldId];
+      }
+      if (incBeginValueMode) {
+        switch (incBeginValueMode) {
+          case 1:
+            result.includeBeginValue = true;
+            break;
+          case 2:
+            result.includeBeginValue = index === 0;
+            break;
+          case 3:
+            result.includeBeginValue = index === items.length - 1;
+            break;
+          default:
+        }
+      }
+      if (incEndValueMode) {
+        switch (incEndValueMode) {
+          case 1:
+            result.includeEndValue = true;
+            break;
+          case 2:
+            result.includeEndValue = index === 0;
+            break;
+          case 3:
+            result.includeEndValue = index === items.length - 1;
+            break;
+          default:
+        }
+      }
+    }
     return result;
   }
   presetconvertData(data) {
@@ -4986,8 +5027,8 @@ var DynamicCodeListCache = class {
           resultItems = tempItems;
         }
       } else {
-        res.data.forEach((item) => {
-          resultItems.push(this.convertData(item));
+        res.data.forEach((item, index) => {
+          resultItems.push(this.convertData(item, index, res.data));
         });
       }
     }
@@ -5002,8 +5043,12 @@ var DynamicCodeListCache = class {
     const { valueAppDEFieldId, pvalueAppDEFieldId } = this.codeList;
     const map = {};
     const nestedList = [];
-    items.forEach((data) => {
-      map[data[valueAppDEFieldId]] = this.convertData(data);
+    items.forEach((data, index) => {
+      map[data[valueAppDEFieldId]] = this.convertData(
+        data,
+        index,
+        items
+      );
     });
     items.forEach((data) => {
       const parent = map[data[pvalueAppDEFieldId]];
@@ -5940,7 +5985,11 @@ var CodeListService = class {
         // 代码项数据
         data: codeItem.data ? ScriptFactory.execSingleLine(codeItem.data) : void 0,
         sysImage: codeItem.sysImage,
-        userData: codeItem.userData
+        userData: codeItem.userData,
+        beginValue: codeItem.beginValue,
+        endValue: codeItem.endValue,
+        includeBeginValue: codeItem.includeBeginValue,
+        includeEndValue: codeItem.includeEndValue
       };
       if ((_a = codeItem.codeItems) == null ? void 0 : _a.length) {
         _codeItem.children = this.formatStaticItems(
@@ -17399,6 +17448,32 @@ var ViewMsgController = class _ViewMsgController {
   }
 };
 
+// src/controller/utils/code-list/code-list.ts
+function calcThresholdRange(codelist, value) {
+  return codelist.find((item) => {
+    if (!item.beginValue && !item.endValue) {
+      return item.value == value;
+    }
+    let beginCond = true;
+    if (item.beginValue) {
+      if (item.includeBeginValue) {
+        beginCond = value >= item.beginValue;
+      } else {
+        beginCond = value > item.beginValue;
+      }
+    }
+    let endCond = true;
+    if (item.endValue) {
+      if (item.includeEndValue) {
+        endCond = value <= item.endValue;
+      } else {
+        endCond = value < item.endValue;
+      }
+    }
+    return beginCond && endCond;
+  });
+}
+
 // src/controller/common/base.controller.ts
 var SELF_KEY = "__self";
 var BaseController = class {
@@ -17808,6 +17883,7 @@ var ViewController = class extends BaseController {
     this.state.isShortCut = false;
   }
   async onCreated() {
+    this.state.isLoading = true;
     await super.onCreated();
     this.modal.hooks.beforeDismiss.tapPromise(async (modalData) => {
       if (isNotNil2(this.state.closeOK)) {
@@ -17851,6 +17927,7 @@ var ViewController = class extends BaseController {
       await Promise.all(this.engines.map((engine2) => engine2.onCreated()));
     }
     ibiz.mc.error.on(this.handleViewError);
+    this.state.isLoading = false;
   }
   async onMounted() {
     var _a;
@@ -18390,6 +18467,16 @@ var EditorController = class {
 // src/controller/common/editor/code-list-editor.controller.ts
 import { RuntimeModelError as RuntimeModelError25 } from "@ibiz-template/core";
 var CodeListEditorController = class extends EditorController {
+  /**
+   * 是否转化为代码项文本
+   *
+   * @readonly
+   * @type {boolean}
+   * @memberof CodeListEditorController
+   */
+  get convertToCodeItemText() {
+    return !!this.parent.model.convertToCodeItemText;
+  }
   /**
    * 加载代码表数据
    * @return {*}
@@ -18497,6 +18584,7 @@ var ControlController = class extends BaseController {
       }
     }
     this.updateContextParams({});
+    this.handleControlParams();
   }
   get _evt() {
     return this.evt;
@@ -18540,7 +18628,6 @@ var ControlController = class extends BaseController {
       const provider = await getControlProvider(this.controlPanel);
       this.providers[this.controlPanel.name] = provider;
     }
-    this.handleControlParams();
     this.initControlScheduler(this.model.controlLogics);
     if ((_a = this.scheduler) == null ? void 0 : _a.hasControlEventTrigger) {
       this._evt.onAll((eventName, event) => {
@@ -30301,36 +30388,6 @@ async function calcColumnModelBySchema(json, c) {
   if (!(Object.keys(properties).length > 0)) {
     return;
   }
-  const addFields = [];
-  Object.keys(properties).forEach((key) => {
-    let type;
-    switch (properties[key].type) {
-      case "string":
-        type = "string";
-        if (properties[key].format === "date-time") {
-          type = "date";
-        }
-        break;
-      case "integer":
-        type = "integer";
-        break;
-      case "number":
-        type = "number";
-        break;
-      default:
-        ibiz.log.error(
-          ibiz.i18n.t("runtime.controller.control.grid.unsupported", {
-            type: properties[key].type
-          })
-        );
-        return;
-    }
-    addFields.push({
-      key,
-      description: properties[key].description,
-      type
-    });
-  });
   const codeNameToId = {};
   const dataEntity = await ibiz.hub.getAppDataEntity(
     c.model.appDataEntityId,
@@ -30339,12 +30396,44 @@ async function calcColumnModelBySchema(json, c) {
   (_a = dataEntity.appDEFields) == null ? void 0 : _a.forEach((field) => {
     codeNameToId[field.codeName.toLowerCase()] = field.id;
   });
+  const addFields = [];
+  Object.keys(properties).forEach((key) => {
+    if (!codeNameToId[key]) {
+      let type;
+      switch (properties[key].type) {
+        case "string":
+          type = "string";
+          if (properties[key].format === "date-time") {
+            type = "date";
+          }
+          break;
+        case "integer":
+          type = "integer";
+          break;
+        case "number":
+          type = "number";
+          break;
+        default:
+          ibiz.log.error(
+            ibiz.i18n.t("runtime.controller.control.grid.unsupported", {
+              type: properties[key].type
+            })
+          );
+          return;
+      }
+      addFields.push({
+        key,
+        description: properties[key].description,
+        type
+      });
+    }
+  });
   const addColumns = [];
   const addDataItems = [];
   addFields.forEach((item) => {
     addColumns.push({
       appId: c.model.appId,
-      appDEFieldId: codeNameToId[item.key],
+      appDEFieldId: item.key,
       id: item.key,
       codeName: item.key,
       columnType: "DEFGRIDCOLUMN",
@@ -30356,7 +30445,7 @@ async function calcColumnModelBySchema(json, c) {
     });
     addDataItems.push({
       appId: c.model.appId,
-      appDEFieldId: codeNameToId[item.key],
+      appDEFieldId: item.key,
       id: item.key,
       valueType: "SIMPLE",
       dataType: TypeToDataType[item.type]
@@ -30551,6 +30640,7 @@ var GridController = class extends MDControlController {
    * @returns {*}  {Promise<void>}
    */
   async onCreated() {
+    this.addSchemaColumn = this.controlParams.enablejsonschema === "true";
     await this.initByEntitySchema();
     await super.onCreated();
     this.service = new GridService(this.model);
@@ -30616,15 +30706,11 @@ var GridController = class extends MDControlController {
       const { degridColumns, degridDataItems } = result;
       this.model = clone27(this.model);
       this.model.degridColumns = [
-        ...(this.model.degridColumns || []).filter((item) => {
-          return degridColumns.findIndex((x) => x.id === item.id) === -1;
-        }),
+        ...this.model.degridColumns || [],
         ...degridColumns
       ];
       this.model.degridDataItems = [
-        ...(this.model.degridDataItems || []).filter((item) => {
-          return degridDataItems.findIndex((x) => x.id === item.id) === -1;
-        }),
+        ...this.model.degridDataItems || [],
         ...degridDataItems
       ];
     }
@@ -31115,28 +31201,16 @@ var GridController = class extends MDControlController {
    */
   initColumnStates() {
     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") {
+          if (column.columnType !== "GROUPGRIDCOLUMN" && !(column.hiddenDataItem || column.hideMode === 2)) {
             this.state.columnStates.push({
               key: column.codeName,
               caption: column.caption,
-              hidden: !!column.hideDefault || !!column.hiddenDataItem,
+              hidden: !!column.hideDefault,
+              hideMode: column.hideMode || 0,
               uaColumn: column.columnType === "UAGRIDCOLUMN",
               adaptive: column.widthUnit === "STAR"
             });
@@ -31145,8 +31219,50 @@ var GridController = class extends MDControlController {
         { childrenFields: ["degridColumns"] }
       );
     }
+    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 = this.mergeGridColumnStates(
+          this.state.columnStates,
+          storageColumnStates.schemaColumnStates
+        );
+      } else if (!this.addSchemaColumn && storageColumnStates.defaultColumnStates) {
+        this.state.columnStates = this.mergeGridColumnStates(
+          this.state.columnStates,
+          storageColumnStates.defaultColumnStates
+        );
+      }
+    }
     this.calcColumnFixed();
   }
+  /**
+   * 合并表格列状态数组
+   *
+   * @param base 基础表格列状态
+   * @param cache 缓存表格列状态
+   * @returns 以基础表格列状态为主，缓存表格列状态修正基础表格列状态
+   */
+  mergeGridColumnStates(base, cache2) {
+    const columnStates = [];
+    if (base.length > 0) {
+      base.forEach((baseColumnState) => {
+        const cacheColumnState = cache2.find((item) => {
+          return item.key === baseColumnState.key;
+        });
+        if (cacheColumnState) {
+          columnStates.push(cacheColumnState);
+        } else {
+          columnStates.push(baseColumnState);
+        }
+      });
+    }
+    return columnStates;
+  }
   /**
    * 计算列的固定状态
    * @author lxm
@@ -31620,6 +31736,9 @@ var GridController = class extends MDControlController {
    * @Date: 2023-12-19 16:02:14
    */
   setColumnVisible(columnState) {
+    if (columnState.hideMode === 3) {
+      return;
+    }
     columnState.hidden = !columnState.hidden;
     this.calcColumnFixed();
     this.saveColumnStates();
@@ -31639,7 +31758,10 @@ var GridController = class extends MDControlController {
       this.state.sortQuery = "";
     }
     if (data.columnstates) {
-      this.state.columnStates = data.columnstates;
+      this.state.columnStates = this.mergeGridColumnStates(
+        this.state.columnStates,
+        data.columnstates
+      );
       this.calcColumnFixed();
     } else {
       this.initColumnStates();
@@ -34390,9 +34512,10 @@ var SearchBarController = class extends ControlController {
     this.state.visible = !!(this.model.enableQuickSearch || this.model.enableGroup || this.enableFilter);
   }
   async onCreated() {
+    this.addSchemaFilters = this.controlParams.enablejsonschema === "true";
+    this.enableStorage = this.controlParams.storage === "true";
     await this.initByEntitySchema();
     await super.onCreated();
-    this.enableStorage = this.controlParams.storage === "true";
     const appDataEntity = await ibiz.hub.getAppDataEntity(
       this.model.appDataEntityId,
       this.context.srfappid
@@ -37873,12 +37996,15 @@ var TreeGridExController = class extends TreeController {
   initColumnStates() {
     var _a;
     (_a = this.model.detreeColumns) == null ? void 0 : _a.forEach((column) => {
-      this.state.columnStates.push({
-        key: column.codeName,
-        caption: column.caption,
-        hidden: !!column.hideDefault,
-        uaColumn: column.columnType === "UAGRIDCOLUMN"
-      });
+      if (column.hideMode !== 2) {
+        this.state.columnStates.push({
+          key: column.codeName,
+          caption: column.caption,
+          hidden: !!column.hideDefault,
+          hideMode: column.hideMode || 0,
+          uaColumn: column.columnType === "UAGRIDCOLUMN"
+        });
+      }
     });
     this.calcColumnFixed();
   }
@@ -40129,7 +40255,7 @@ var GanttController = class extends TreeGridExController {
       );
     } else {
       return {
-        cancel: !result.ok
+        cancel: result ? !result.ok : true
       };
     }
   }
@@ -42131,14 +42257,14 @@ var MDViewEngine = class extends ViewEngineBase {
       event,
       view: this.view
     }));
-    if (result === -1 || !result) {
+    if (result === -1) {
       throw new RuntimeModelError73(
         this.view.model,
         ibiz.i18n.t("runtime.engine.logicOpendata")
       );
     } else {
       return {
-        cancel: !result.ok
+        cancel: result ? !result.ok : true
       };
     }
   }
@@ -42181,7 +42307,7 @@ var MDViewEngine = class extends ViewEngineBase {
       );
     } else {
       return {
-        cancel: !result.ok
+        cancel: result ? !result.ok : true
       };
     }
   }
@@ -45115,6 +45241,7 @@ export {
   calcResPath,
   calcSearchCondExs,
   calcSearchConds,
+  calcThresholdRange,
   compare,
   compareNumber,
   contains,