@ibiz-template/runtime 0.7.31-alpha.0 → 0.7.31-alpha.1

package/dist/index.esm.js

@@ -16020,10 +16020,7 @@ var _OpenAppViewCommand = class _OpenAppViewCommand {
       case "POPUPMODAL":
         return this.openModal(appView, context, params);
       case "POPUPAPP":
-        throw new ModelError15(
-          appView,
-          ibiz.i18n.t("runtime.command.app.unsupportedPopupapp")
-        );
+        return this.openPopupApp(appView, context, params);
       case "POPOVER":
         return this.openPopover(appView, context, params, opts);
       case "DRAWER_LEFT":
@@ -16126,6 +16123,20 @@ var _OpenAppViewCommand = class _OpenAppViewCommand {
   async openUserCustom(appView, context, params = {}) {
     return ibiz.openView.custom(appView.id, context, params);
   }
+  /**
+   * 独立程序弹出
+   *
+   * @author zzq
+   * @date 2024-07-19 20:07:55
+   * @protected
+   * @param {IViewConfig} appView
+   * @param {IContext} [context]
+   * @param {IParams} [params={}]
+   * @return {*}  {Promise<void>}
+   */
+  async openPopupApp(appView, context, params = {}) {
+    return ibiz.openView.popupApp(appView.id, context, params);
+  }
 };
 _OpenAppViewCommand.TAG = "ibiz.app-view.open";
 var OpenAppViewCommand = _OpenAppViewCommand;
@@ -21631,9 +21642,15 @@ var BaseSeriesGenerator = class {
             } else if (mode === "field") {
               const tempdata = data.map((_data) => {
                 var _a2, _b2;
+                let tempValue;
+                if ((_a2 = _data.$origin) == null ? void 0 : _a2.$origin) {
+                  tempValue = _data.$origin.$origin[codename];
+                } else {
+                  tempValue = (_b2 = _data.$origin) == null ? void 0 : _b2[codename];
+                }
                 return {
                   text: _data[codename],
-                  value: (_b2 = (_a2 = _data.$origin) == null ? void 0 : _a2.$origin) == null ? void 0 : _b2[codename]
+                  value: tempValue
                 };
               });
               tempCodeLists.push({ codename, codelist: tempdata });
@@ -21703,8 +21720,14 @@ var BaseSeriesGenerator = class {
         return;
       }
       if (!catalogCodeListId) {
+        let tempValue;
+        if ((_a = item.$origin) == null ? void 0 : _a.$origin) {
+          tempValue = item.$origin.$origin[this.catalogField];
+        } else {
+          tempValue = (_b = item.$origin) == null ? void 0 : _b[this.catalogField];
+        }
         this.catalogMap.set(item[this.catalogField], {
-          [this.catalogField]: (_b = (_a = item.$origin) == null ? void 0 : _a.$origin) == null ? void 0 : _b[this.catalogField]
+          [this.catalogField]: tempValue
         });
       }
       if (!groupData[group].get(catalog)) {
@@ -22593,10 +22616,10 @@ var ChartOptionsGenerator2 = class {
     if (controlParam && ((_a = controlParam.ctrlParams) == null ? void 0 : _a.ZONE)) {
       const length = (_b = this.model.dechartSerieses) == null ? void 0 : _b.length;
       if (length) {
-        const height = 90 / length;
+        const height = 85 / length;
         const items = [];
         for (let i = 0; i < length; i++) {
-          const top = i * height + 5;
+          const top = i * height + 10;
           const bottom = 100 - (height + top);
           items.push({
             top: "".concat(top, "%"),
@@ -22660,7 +22683,7 @@ var ChartOptionsGenerator2 = class {
                   if (((_a2 = controlParam.ctrlParams) == null ? void 0 : _a2.MODE) === "ROW") {
                     const yAxisData = this.handleAxisLayout(
                       codeListItems,
-                      40,
+                      60,
                       tempCatalogFields.length,
                       index
                     );
@@ -22724,7 +22747,7 @@ var ChartOptionsGenerator2 = class {
                 });
               } else {
                 Object.assign(this.chartUserParam.grid, {
-                  left: (catalogLength + 1) * 40
+                  left: (catalogLength + 1) * 60
                 });
               }
               const tempyAxis = this.chartUserParam.yAxis;
@@ -22745,7 +22768,7 @@ var ChartOptionsGenerator2 = class {
                   {
                     value: mergeName.split("").join("\n"),
                     textStyle: {
-                      padding: [0, catalogLength * 40, 0, 0],
+                      padding: [0, catalogLength * 50, 0, 0],
                       ...nameTextStyle
                     }
                   }
@@ -37022,6 +37045,17 @@ var SearchBarController = class extends ControlController {
         }
       }
     });
+    if (!searchconds) {
+      const customNodes = [
+        {
+          nodeType: "GROUP",
+          logicType: "AND",
+          children: []
+        }
+      ];
+      this.attachCustomCond(customNodes);
+      return calcSearchConds(customNodes);
+    }
     return searchconds;
   }
   /**
@@ -37177,7 +37211,18 @@ var SearchBarController = class extends ControlController {
     if (this.grid && this.state.selectedSearchGroupItem) {
       const nodes = clone34(this.state.filterNodes);
       this.attachCustomCond(nodes);
-      const filters = calcSearchCondExs(nodes);
+      let filters = calcSearchCondExs(nodes);
+      if (!filters) {
+        const customNodes = [
+          {
+            nodeType: "GROUP",
+            logicType: "AND",
+            children: []
+          }
+        ];
+        this.attachCustomCond(customNodes);
+        filters = calcSearchCondExs(customNodes);
+      }
       const saveParams = {
         searchconds: filters,
         sort: this.grid.state.sortQuery,